From nobody Sun Feb 8 05:30:17 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 552EE352946 for ; Sat, 31 Jan 2026 13:29:24 +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=1769866166; cv=none; b=Ztzn4F8Gr43803k/ju2pHdWx/gHjAq+fTf9mg4J8R1JCBiPrmBSLCtLM74jzPxcTkyCP8j2O4zYwJb+t8J9BAHHFsp149n2Elq3fljL3PKF+JltitNYDfPX5JCgblgBUsOEyBRSrrc++ATJVkKwTssFh5HCQGRp0mupU3u39ayE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866166; c=relaxed/simple; bh=YpT43noux36Qb8SPRAxAVRkhFfy4HwaeXM5l7XWGGkw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qtfuCXEWkpOdR+C0ZhuJY+YyIpf5rWbrIcnxYAvjYFfWck/SkkwAXDccU51CqdiLJv3d2THTPsukmtiOHsSqlqfd1AhlR9yV+uOOceXEeIGcVmlIqdkhBzH+TFRLY4N4XIDCRZlhGUh8I0QAqegbrz3Yuu5Rp1fyD9DYRIi3SKU= 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=VI7q487C; 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="VI7q487C" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4806cfffca6so32374235e9.2 for ; Sat, 31 Jan 2026 05:29:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866163; x=1770470963; 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=AZUIc60w8aDIxM9yUNkpf1enaQr7Rd+FSbamqcyyReA=; b=VI7q487CmZOIo+01B4R9MgNl5VKEa6WkOnkToDmYxHeSqH4Qejfj662WMwJKMENhWm HuQI5h4Bq83fZQ/P9c9z45V2LqvLAqDbB+bd7n7Yzt9ui6kTv9PzU3vvw6T8/8Mllg6d acRTPjJGjtZuTV5Qi2C6/erZfErlv9q2A+/4ItbM9AG5e5BD2HAkMG+yk1GdXEgbe8Ef OuAUtMWdrRVovAFIrvqhYTOpTDDsNnJ6h3kp0jB/xX8xwyB4B6E4rHWuJnHl8DLoE56S tDOT3ggKgFcIM/PzOfbQFNmKi4GjQctkjSogCpmp6exKhwtCM3fQ/jb7wtWOh9KyLg9s A5vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866163; x=1770470963; 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=AZUIc60w8aDIxM9yUNkpf1enaQr7Rd+FSbamqcyyReA=; b=vc/6L3NewjF55aILTxpgdINwdjVe0x8NzW46ZWPWok0xwfjCJ1Sjei/iDzHHeaS9am yI1KeQJ2MlivaY3r5fKX91WxumGPrjmVXG8kzLACox56AYh543eeWVJaHOj812KS4f0C 5cSFjU1iN+t1XWD0jukSLb7UdoBmu8bWphIHRSXzGDiDVBKraHPAhWMfojwnHrXV3irG 2FQ+bGhA1dv5qPZ1D3H9WMfb3+B7lE4HL2jVU7HIgGc6HHSBAa6v4R+tYj0iqzXBEEqd ZQ3BOPWfF8cNz0hTQ18K6xefmKN2rSAwiMJTmoUcGIJl4uxQIrJoU61F5gVyX8XMSD87 ni3A== X-Forwarded-Encrypted: i=1; AJvYcCUs2nvY/EpNZirm7DORcLzT/OovJLYLr+2c38nUhxXRAnBYERwr7OnLvNF+gPn8zK/1ehDGq6fw1yI7DEk=@vger.kernel.org X-Gm-Message-State: AOJu0YzBHbehdBLuowY7Sh+Hckw+SOLtv7HhQs59ZWO4ODFEUjZ78RZm udttR1NY/2tQ43KVdqJJc2LqDYrjJqOswQ6nKs4hJq/V+rV51jStA19rLzqqi4ZZ+GzWGI4uwdb OxiN8u3ZSdDMccT5KGUkaEQ== X-Received: from wrfi9.prod.google.com ([2002:a5d:5849:0:b0:435:a2c9:8c02]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4ec7:b0:47b:da85:b9ef with SMTP id 5b1f17b1804b1-482db463c13mr79331465e9.16.1769866162768; Sat, 31 Jan 2026 05:29:22 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:19 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-2-vdonnefort@google.com> Subject: [PATCH v11 01/30] ring-buffer: Add page statistics to the meta-page From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add two fields pages_touched and pages_lost to the ring-buffer meta-page. Those fields are useful to get the number of used pages in the ring-buffer. Reviewed-by: Steven Rostedt (Google) Signed-off-by: Vincent Donnefort diff --git a/include/uapi/linux/trace_mmap.h b/include/uapi/linux/trace_mma= p.h index c102ef35d11e..e8185889a1c8 100644 --- a/include/uapi/linux/trace_mmap.h +++ b/include/uapi/linux/trace_mmap.h @@ -17,8 +17,8 @@ * @entries: Number of entries in the ring-buffer. * @overrun: Number of entries lost in the ring-buffer. * @read: Number of entries that have been read. - * @Reserved1: Internal use only. - * @Reserved2: Internal use only. + * @pages_lost: Number of pages overwritten by the writer. + * @pages_touched: Number of pages written by the writer. */ struct trace_buffer_meta { __u32 meta_page_size; @@ -39,8 +39,8 @@ struct trace_buffer_meta { __u64 overrun; __u64 read; =20 - __u64 Reserved1; - __u64 Reserved2; + __u64 pages_lost; + __u64 pages_touched; }; =20 #define TRACE_MMAP_IOCTL_GET_READER _IO('R', 0x20) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 630221b00838..1187d632dd5d 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -6131,6 +6131,8 @@ static void rb_update_meta_page(struct ring_buffer_pe= r_cpu *cpu_buffer) meta->entries =3D local_read(&cpu_buffer->entries); meta->overrun =3D local_read(&cpu_buffer->overrun); meta->read =3D cpu_buffer->read; + meta->pages_lost =3D local_read(&cpu_buffer->pages_lost); + meta->pages_touched =3D local_read(&cpu_buffer->pages_touched); =20 /* Some archs do not have data cache coherency between kernel and user-sp= ace */ flush_kernel_vmap_range(cpu_buffer->meta_page, PAGE_SIZE); --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 2026 Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.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 93E3C352C2A for ; Sat, 31 Jan 2026 13:29:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866167; cv=none; b=km/QuextOtdG0Q4i1ls22uY2emU34NYRBjISsvbo7VeCgixSLSJIisk9QekNWcXXf07Gsofseuc8TRgjDS230fJoKk+2lJflG5VP4qVjBvpuq1xixFbTnNCUSm8/9/uIo3miLdgFXetCwEPU81lw0Pdg9Sgng9fgafw47g2wMzw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866167; c=relaxed/simple; bh=RJWjeYAvcYE0G2q2xGvAOWGYBGJxgtvgmHt6tSOKAYo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ma6KXCVXI32CVZTh0N6UCDb7NXvAM6JyRnZl9ALlWzBHoXgXO6LQ4m4pvpQrlYIG5uA49owiSzjhnKOKONWhfNAM55kUnhlaVCK0iGBJIWKIbJeF4rMoVE9o2OZgYHWgYMDpbg2LRfzIKfnzPX5xII4nNo1w6ADTUTnw/0vz1ZU= 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=Itq+b8Ok; arc=none smtp.client-ip=209.85.208.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="Itq+b8Ok" Received: by mail-ed1-f73.google.com with SMTP id 4fb4d7f45d1cf-64d1a0f7206so2628299a12.0 for ; Sat, 31 Jan 2026 05:29:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866164; x=1770470964; 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=tUISk/ccjHYHokYv6vg+0xvhja6CQE9jzscbfeu7VUc=; b=Itq+b8OkgBDmX4w1RJ5N22lxG7iRpMUxDB1kVi7c14ph7GETeea5pxiP8DHfZ0NHOn 7fr4msWLy4D3TLu3JwNfw7JagCLo8fExidAZ071CXDxPuAyVT2N0wSDfr6G56erMgzPx LLcFHqC8mUujlUY6Fd2e8rRYeIel3nrflx9KnN7UxxC+cA5Lw9Wp90yvTxn2uoDBgKIr 2PnaAJ6/GQqKhnzwElf+zWXu56RMsJ8Qt/zS/aFAMNsTXiQdVDiziBgiVYiLsEHtus2z oxfTrweBfk8TZptYQNTHjclmDbJOVLdwrPOIQLYthFJqUz2Sx/XT+Awizz7bV3COfb4l 49wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866164; x=1770470964; 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=tUISk/ccjHYHokYv6vg+0xvhja6CQE9jzscbfeu7VUc=; b=Fnag9OjgRvcQsPMhkrYXR9Ql2MpQcxntyv/394B/P0WKW5V4ilGZGtcoPaM7tBQafd J68MbXuM4U0lIdbw6QiT2PGjObS+uJ7q0Id1riy2FlCCjEEtHlTg3otmUHrBA4hmH+61 cM8KHyLidO4P8xXPQEVv8EWUV8LDg4egaNn/DVVjNQ4ekf8z24VilmR8JRlCeGu1YMDA aOR8jD/qPsy9r9BR+APEi/d3oHfJsSS6EJmGkt7CecYXhTDTP30Gxj+41eBCljzSKORd egplQ/ocBawQWR2ZR4AtUWEqW/NYIAuWXX940hE7xHFLI46FKrteMJqGniLP5PlPWMqc egmQ== X-Forwarded-Encrypted: i=1; AJvYcCUuGjaoHmqxO/SVzgzHvunvHExNqfD4HjJ8r3bk9UrAu7cNPXWp1bh3BC5kly2aXKe5MZmxceCp79fqqbs=@vger.kernel.org X-Gm-Message-State: AOJu0Yw00FFtg1xaSXRq986B8k+kmyAaCB9eYrqr834fSjD3CDswPNFq PDhzOF0W/bHRMbnMyHSIXEJy4GHFLG+h8g2K85DFNkij2SnC+Tk18RU9S93vP0IC0HmhSalvILA 2fB5OxrqQiWy9gwWJO4Q2Wg== X-Received: from edad40.prod.google.com ([2002:a05:6402:4028:b0:658:817:e783]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:2711:b0:658:11c5:2f96 with SMTP id 4fb4d7f45d1cf-658de5a9a0bmr3448451a12.25.1769866163834; Sat, 31 Jan 2026 05:29:23 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:20 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-3-vdonnefort@google.com> Subject: [PATCH v11 02/30] ring-buffer: Store bpage pointers into subbuf_ids From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The subbuf_ids field allows to point to a specific page from the ring-buffer based on its ID. As a preparation or the upcoming ring-buffer remote support, point this array to the buffer_page instead of the buffer_data_page. Reviewed-by: Steven Rostedt (Google) Signed-off-by: Vincent Donnefort diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 1187d632dd5d..a5d11487337e 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -554,7 +554,7 @@ struct ring_buffer_per_cpu { unsigned int mapped; unsigned int user_mapped; /* user space mapping */ struct mutex mapping_lock; - unsigned long *subbuf_ids; /* ID to subbuf VA */ + struct buffer_page **subbuf_ids; /* ID to subbuf VA */ struct trace_buffer_meta *meta_page; struct ring_buffer_cpu_meta *ring_meta; =20 @@ -7013,7 +7013,7 @@ static void rb_free_meta_page(struct ring_buffer_per_= cpu *cpu_buffer) } =20 static void rb_setup_ids_meta_page(struct ring_buffer_per_cpu *cpu_buffer, - unsigned long *subbuf_ids) + struct buffer_page **subbuf_ids) { struct trace_buffer_meta *meta =3D cpu_buffer->meta_page; unsigned int nr_subbufs =3D cpu_buffer->nr_pages + 1; @@ -7022,7 +7022,7 @@ static void rb_setup_ids_meta_page(struct ring_buffer= _per_cpu *cpu_buffer, int id =3D 0; =20 id =3D rb_page_id(cpu_buffer, cpu_buffer->reader_page, id); - subbuf_ids[id++] =3D (unsigned long)cpu_buffer->reader_page->page; + subbuf_ids[id++] =3D cpu_buffer->reader_page; cnt++; =20 first_subbuf =3D subbuf =3D rb_set_head_page(cpu_buffer); @@ -7032,7 +7032,7 @@ static void rb_setup_ids_meta_page(struct ring_buffer= _per_cpu *cpu_buffer, if (WARN_ON(id >=3D nr_subbufs)) break; =20 - subbuf_ids[id] =3D (unsigned long)subbuf->page; + subbuf_ids[id] =3D subbuf; =20 rb_inc_page(&subbuf); id++; @@ -7041,7 +7041,7 @@ static void rb_setup_ids_meta_page(struct ring_buffer= _per_cpu *cpu_buffer, =20 WARN_ON(cnt !=3D nr_subbufs); =20 - /* install subbuf ID to kern VA translation */ + /* install subbuf ID to bpage translation */ cpu_buffer->subbuf_ids =3D subbuf_ids; =20 meta->meta_struct_len =3D sizeof(*meta); @@ -7197,13 +7197,15 @@ static int __rb_map_vma(struct ring_buffer_per_cpu = *cpu_buffer, } =20 while (p < nr_pages) { + struct buffer_page *subbuf; struct page *page; int off =3D 0; =20 if (WARN_ON_ONCE(s >=3D nr_subbufs)) return -EINVAL; =20 - page =3D virt_to_page((void *)cpu_buffer->subbuf_ids[s]); + subbuf =3D cpu_buffer->subbuf_ids[s]; + page =3D virt_to_page((void *)subbuf->page); =20 for (; off < (1 << (subbuf_order)); off++, page++) { if (p >=3D nr_pages) @@ -7230,7 +7232,8 @@ int ring_buffer_map(struct trace_buffer *buffer, int = cpu, struct vm_area_struct *vma) { struct ring_buffer_per_cpu *cpu_buffer; - unsigned long flags, *subbuf_ids; + struct buffer_page **subbuf_ids; + unsigned long flags; int err; =20 if (!cpumask_test_cpu(cpu, buffer->cpumask)) @@ -7254,7 +7257,7 @@ int ring_buffer_map(struct trace_buffer *buffer, int = cpu, if (err) return err; =20 - /* subbuf_ids include the reader while nr_pages does not */ + /* subbuf_ids includes the reader while nr_pages does not */ subbuf_ids =3D kcalloc(cpu_buffer->nr_pages + 1, sizeof(*subbuf_ids), GFP= _KERNEL); if (!subbuf_ids) { rb_free_meta_page(cpu_buffer); --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 39CA7352C54 for ; Sat, 31 Jan 2026 13:29:26 +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=1769866168; cv=none; b=gbzP1GemcwXMo5HhtTRKCQjmZguOg0AMA1k52wbE1zuKsxjmi/b0OQoeThTvlos75aGUXXj7qFGwqohR3CZbQXJt9CcyS7Kc1J2mwQueqhnECojoGReEb3H/wcbV62yUVsfSj5g/2vs6kP2YPLFg5ZERYmBTP3HnyQhew4WGJJg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866168; c=relaxed/simple; bh=VWiYuTTVkdVdVrTxWcBdzIEqRGfmm+ev+jYbZOjRdWs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=aC34CmAq01mCzXuUIelKMTv+3HLuJS6sj/4dsKjLrMcQn9blC35ZlqewggvWRAApakbmSFj4HyghrFwvlevTIVg2YgHN67U6kqLyuwXAmEMnA2/RCTbcq1pIm2A8+EN9pDYzJLbjIN2dbE45x5XIsVGeyscNdBUmTD0u8ROMWMk= 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=1dAZ9Geh; 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="1dAZ9Geh" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4806fa4a180so23826715e9.2 for ; Sat, 31 Jan 2026 05:29:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866164; x=1770470964; 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=j4iLepSjIOikmta/cyHHk3gnManmaF0Hd8NLtgwyPX4=; b=1dAZ9GehDOSNQfFhf1RBGsuoD+XSbvGXChL50ZgTO0INOqdbICrmcRrphZTK28/Nud 193zsuR5QmiSkRVmiS66GDtBIQlCt2ByQjNI/aitgLZ9cHGvy9ws7pAHqXM8keoh9W84 rZ1ahVuHTkaRJh/lzgZOv+cngTqYRU4BeE5m7VjamqKZ0svLRJPOmwBMCYTkPI+yXG5n KY0BXBrJJOJzXO9hmfDcE91aJ/ty+50R3OHmxDgRjzRxEEpUGP2gWkCZ/astLYpIAG7L iMBlnn4Ci5vIvdDjU2dYc1l+PKTkMf6yV64gib59hhxWxIPn2k88vhH2ACFpn9l6LblO HIZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866164; x=1770470964; 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=j4iLepSjIOikmta/cyHHk3gnManmaF0Hd8NLtgwyPX4=; b=vrbTiPztz1SVJiVeDvsW3jcP06Tmr80QduAoFGauHVa2whRvsoRhPVoMegZ87owbMO vcGgkZhFf6YCYgLADzFwNmBNyyacdu+ZY+LkdufCXekkD7KmMat7bE2DFSAWeJFnu0e/ NCCk0pdOddLR3TSvWVTCRRCNH/UB7woOkQn0HVtKoxxin2nGNH+h1bCjZU022LZGYJqr x0HHHYCaRByhbkXWPV+GxVgJgOkvzKy9GWSyndSMuTZIvQLDavKm+EjOIYdSjJx+OnLh J3HpsAVG/WOQ45Jo+Q7GvANogABGOBsaZk6w0JDpZhdUJk19bEi/bNQ3Y+wh22U7u3kZ ZOwQ== X-Forwarded-Encrypted: i=1; AJvYcCU38L7o1kl4w/ovqtWf0VhMvB+nJN+N/MsB7NK5HcomYS6QBr+q94vmxdVAAEYa9iU3YNZtoB7o5wyKJp8=@vger.kernel.org X-Gm-Message-State: AOJu0YznbMf+MPSuEs6bl0Adb/pgk1aqxM59Mxz4C7pkgectYgUpgCUu Ou2jDiO2YeyRkmPS1eWbYAm+SQx0PFrXQlXjNDoKlVAnvPKdVznQrTYmaXtF0Ann8sCr0iX4iat CuhqPE8b0qPAiajpmL4NgEQ== X-Received: from wmop16.prod.google.com ([2002:a05:600c:4690:b0:477:9fac:c456]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:c3cb:10b0:482:f12f:f35e with SMTP id 5b1f17b1804b1-482f12ff3e4mr7443785e9.12.1769866164707; Sat, 31 Jan 2026 05:29:24 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:21 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-4-vdonnefort@google.com> Subject: [PATCH v11 03/30] ring-buffer: Introduce ring-buffer remotes From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A ring-buffer remote is an entity outside of the kernel (most likely a firmware or a hypervisor) capable of writing events in a ring-buffer following the same format as the tracefs ring-buffer. To setup the ring-buffer on the kernel side, a description of the pages forming the ring-buffer (struct trace_buffer_desc) must be given. Callbacks (swap_reader_page and reset) must also be provided. It is expected from the remote to keep the meta-page updated. Reviewed-by: Steven Rostedt (Google) Signed-off-by: Vincent Donnefort diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index 876358cfe1b1..41193c5b0d28 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -250,4 +250,62 @@ int ring_buffer_map(struct trace_buffer *buffer, int c= pu, struct vm_area_struct *vma); int ring_buffer_unmap(struct trace_buffer *buffer, int cpu); int ring_buffer_map_get_reader(struct trace_buffer *buffer, int cpu); + +struct ring_buffer_desc { + int cpu; + unsigned int nr_page_va; /* excludes the meta page */ + unsigned long meta_va; + unsigned long page_va[] __counted_by(nr_page_va); +}; + +struct trace_buffer_desc { + int nr_cpus; + size_t struct_len; + char __data[]; /* list of ring_buffer_desc */ +}; + +static inline struct ring_buffer_desc *__next_ring_buffer_desc(struct ring= _buffer_desc *desc) +{ + size_t len =3D struct_size(desc, page_va, desc->nr_page_va); + + return (struct ring_buffer_desc *)((void *)desc + len); +} + +static inline struct ring_buffer_desc *__first_ring_buffer_desc(struct tra= ce_buffer_desc *desc) +{ + return (struct ring_buffer_desc *)(&desc->__data[0]); +} + +static inline size_t trace_buffer_desc_size(size_t buffer_size, unsigned i= nt nr_cpus) +{ + unsigned int nr_pages =3D max(DIV_ROUND_UP(buffer_size, PAGE_SIZE), 2UL) = + 1; + struct ring_buffer_desc *rbdesc; + + return size_add(offsetof(struct trace_buffer_desc, __data), + size_mul(nr_cpus, struct_size(rbdesc, page_va, nr_pages))); +} + +#define for_each_ring_buffer_desc(__pdesc, __cpu, __trace_pdesc) \ + for (__pdesc =3D __first_ring_buffer_desc(__trace_pdesc), __cpu =3D 0; \ + (__cpu) < (__trace_pdesc)->nr_cpus; \ + (__cpu)++, __pdesc =3D __next_ring_buffer_desc(__pdesc)) + +struct ring_buffer_remote { + struct trace_buffer_desc *desc; + int (*swap_reader_page)(unsigned int cpu, void *priv); + int (*reset)(unsigned int cpu, void *priv); + void *priv; +}; + +int ring_buffer_poll_remote(struct trace_buffer *buffer, int cpu); + +struct trace_buffer * +__ring_buffer_alloc_remote(struct ring_buffer_remote *remote, + struct lock_class_key *key); + +#define ring_buffer_alloc_remote(remote) \ +({ \ + static struct lock_class_key __key; \ + __ring_buffer_alloc_remote(remote, &__key); \ +}) #endif /* _LINUX_RING_BUFFER_H */ diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index a5d11487337e..00754339733d 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -558,6 +558,8 @@ struct ring_buffer_per_cpu { struct trace_buffer_meta *meta_page; struct ring_buffer_cpu_meta *ring_meta; =20 + struct ring_buffer_remote *remote; + /* ring buffer pages to update, > 0 to add, < 0 to remove */ long nr_pages_to_update; struct list_head new_pages; /* new pages to add */ @@ -580,6 +582,8 @@ struct trace_buffer { =20 struct ring_buffer_per_cpu **buffers; =20 + struct ring_buffer_remote *remote; + struct hlist_node node; u64 (*clock)(void); =20 @@ -2232,6 +2236,40 @@ static void rb_meta_buffer_update(struct ring_buffer= _per_cpu *cpu_buffer, } } =20 +static struct ring_buffer_desc *ring_buffer_desc(struct trace_buffer_desc = *trace_desc, int cpu) +{ + struct ring_buffer_desc *desc, *end; + size_t len; + int i; + + if (!trace_desc) + return NULL; + + if (cpu >=3D trace_desc->nr_cpus) + return NULL; + + end =3D (struct ring_buffer_desc *)((void *)trace_desc + trace_desc->stru= ct_len); + desc =3D __first_ring_buffer_desc(trace_desc); + len =3D struct_size(desc, page_va, desc->nr_page_va); + desc =3D (struct ring_buffer_desc *)((void *)desc + (len * cpu)); + + if (desc < end && desc->cpu =3D=3D cpu) + return desc; + + /* Missing CPUs, need to linear search */ + for_each_ring_buffer_desc(desc, i, trace_desc) { + if (desc->cpu =3D=3D cpu) + return desc; + } + + return NULL; +} + +static void *ring_buffer_desc_page(struct ring_buffer_desc *desc, int page= _id) +{ + return page_id > desc->nr_page_va ? NULL : (void *)desc->page_va[page_id]; +} + static int __rb_allocate_pages(struct ring_buffer_per_cpu *cpu_buffer, long nr_pages, struct list_head *pages) { @@ -2239,6 +2277,7 @@ static int __rb_allocate_pages(struct ring_buffer_per= _cpu *cpu_buffer, struct ring_buffer_cpu_meta *meta =3D NULL; struct buffer_page *bpage, *tmp; bool user_thread =3D current->mm !=3D NULL; + struct ring_buffer_desc *desc =3D NULL; long i; =20 /* @@ -2267,6 +2306,12 @@ static int __rb_allocate_pages(struct ring_buffer_pe= r_cpu *cpu_buffer, if (buffer->range_addr_start) meta =3D rb_range_meta(buffer, nr_pages, cpu_buffer->cpu); =20 + if (buffer->remote) { + desc =3D ring_buffer_desc(buffer->remote->desc, cpu_buffer->cpu); + if (!desc || WARN_ON(desc->nr_page_va !=3D (nr_pages + 1))) + return -EINVAL; + } + for (i =3D 0; i < nr_pages; i++) { =20 bpage =3D alloc_cpu_page(cpu_buffer->cpu); @@ -2291,6 +2336,16 @@ static int __rb_allocate_pages(struct ring_buffer_pe= r_cpu *cpu_buffer, rb_meta_buffer_update(cpu_buffer, bpage); bpage->range =3D 1; bpage->id =3D i + 1; + } else if (desc) { + void *p =3D ring_buffer_desc_page(desc, i + 1); + + if (WARN_ON(!p)) + goto free_pages; + + bpage->page =3D p; + bpage->range =3D 1; /* bpage->page can't be freed */ + bpage->id =3D i + 1; + cpu_buffer->subbuf_ids[i + 1] =3D bpage; } else { int order =3D cpu_buffer->buffer->subbuf_order; bpage->page =3D alloc_cpu_data(cpu_buffer->cpu, order); @@ -2388,6 +2443,30 @@ rb_allocate_cpu_buffer(struct trace_buffer *buffer, = long nr_pages, int cpu) if (cpu_buffer->ring_meta->head_buffer) rb_meta_buffer_update(cpu_buffer, bpage); bpage->range =3D 1; + } else if (buffer->remote) { + struct ring_buffer_desc *desc =3D ring_buffer_desc(buffer->remote->desc,= cpu); + + if (!desc) + goto fail_free_reader; + + cpu_buffer->remote =3D buffer->remote; + cpu_buffer->meta_page =3D (struct trace_buffer_meta *)(void *)desc->meta= _va; + cpu_buffer->nr_pages =3D nr_pages; + cpu_buffer->subbuf_ids =3D kcalloc(cpu_buffer->nr_pages + 1, + sizeof(*cpu_buffer->subbuf_ids), GFP_KERNEL); + if (!cpu_buffer->subbuf_ids) + goto fail_free_reader; + + /* Remote buffers are read-only and immutable */ + atomic_inc(&cpu_buffer->record_disabled); + atomic_inc(&cpu_buffer->resize_disabled); + + bpage->page =3D ring_buffer_desc_page(desc, cpu_buffer->meta_page->reade= r.id); + if (!bpage->page) + goto fail_free_reader; + + bpage->range =3D 1; + cpu_buffer->subbuf_ids[0] =3D bpage; } else { int order =3D cpu_buffer->buffer->subbuf_order; bpage->page =3D alloc_cpu_data(cpu, order); @@ -2447,6 +2526,9 @@ static void rb_free_cpu_buffer(struct ring_buffer_per= _cpu *cpu_buffer) =20 irq_work_sync(&cpu_buffer->irq_work.work); =20 + if (cpu_buffer->remote) + kfree(cpu_buffer->subbuf_ids); + free_buffer_page(cpu_buffer->reader_page); =20 if (head) { @@ -2469,7 +2551,8 @@ static struct trace_buffer *alloc_buffer(unsigned lon= g size, unsigned flags, int order, unsigned long start, unsigned long end, unsigned long scratch_size, - struct lock_class_key *key) + struct lock_class_key *key, + struct ring_buffer_remote *remote) { struct trace_buffer *buffer __free(kfree) =3D NULL; long nr_pages; @@ -2509,6 +2592,8 @@ static struct trace_buffer *alloc_buffer(unsigned lon= g size, unsigned flags, if (!buffer->buffers) goto fail_free_cpumask; =20 + cpu =3D raw_smp_processor_id(); + /* If start/end are specified, then that overrides size */ if (start && end) { unsigned long buffers_start; @@ -2564,6 +2649,15 @@ static struct trace_buffer *alloc_buffer(unsigned lo= ng size, unsigned flags, buffer->range_addr_end =3D end; =20 rb_range_meta_init(buffer, nr_pages, scratch_size); + } else if (remote) { + struct ring_buffer_desc *desc =3D ring_buffer_desc(remote->desc, cpu); + + buffer->remote =3D remote; + /* The writer is remote. This ring-buffer is read-only */ + atomic_inc(&buffer->record_disabled); + nr_pages =3D desc->nr_page_va - 1; + if (nr_pages < 2) + goto fail_free_buffers; } else { =20 /* need at least two pages */ @@ -2572,7 +2666,6 @@ static struct trace_buffer *alloc_buffer(unsigned lon= g size, unsigned flags, nr_pages =3D 2; } =20 - cpu =3D raw_smp_processor_id(); cpumask_set_cpu(cpu, buffer->cpumask); buffer->buffers[cpu] =3D rb_allocate_cpu_buffer(buffer, nr_pages, cpu); if (!buffer->buffers[cpu]) @@ -2614,7 +2707,7 @@ struct trace_buffer *__ring_buffer_alloc(unsigned lon= g size, unsigned flags, struct lock_class_key *key) { /* Default buffer page size - one system page */ - return alloc_buffer(size, flags, 0, 0, 0, 0, key); + return alloc_buffer(size, flags, 0, 0, 0, 0, key, NULL); =20 } EXPORT_SYMBOL_GPL(__ring_buffer_alloc); @@ -2641,7 +2734,18 @@ struct trace_buffer *__ring_buffer_alloc_range(unsig= ned long size, unsigned flag struct lock_class_key *key) { return alloc_buffer(size, flags, order, start, start + range_size, - scratch_size, key); + scratch_size, key, NULL); +} + +/** + * __ring_buffer_alloc_remote - allocate a new ring_buffer from a remote + * @remote: Contains a description of the ring-buffer pages and remote cal= lbacks. + * @key: ring buffer reader_lock_key. + */ +struct trace_buffer *__ring_buffer_alloc_remote(struct ring_buffer_remote = *remote, + struct lock_class_key *key) +{ + return alloc_buffer(0, 0, 0, 0, 0, 0, key, remote); } =20 void *ring_buffer_meta_scratch(struct trace_buffer *buffer, unsigned int *= size) @@ -5251,6 +5355,16 @@ unsigned long ring_buffer_overruns(struct trace_buff= er *buffer) } EXPORT_SYMBOL_GPL(ring_buffer_overruns); =20 +static bool rb_read_remote_meta_page(struct ring_buffer_per_cpu *cpu_buffe= r) +{ + local_set(&cpu_buffer->entries, READ_ONCE(cpu_buffer->meta_page->entries)= ); + local_set(&cpu_buffer->overrun, READ_ONCE(cpu_buffer->meta_page->overrun)= ); + local_set(&cpu_buffer->pages_touched, READ_ONCE(cpu_buffer->meta_page->pa= ges_touched)); + local_set(&cpu_buffer->pages_lost, READ_ONCE(cpu_buffer->meta_page->pages= _lost)); + + return rb_num_of_entries(cpu_buffer); +} + static void rb_iter_reset(struct ring_buffer_iter *iter) { struct ring_buffer_per_cpu *cpu_buffer =3D iter->cpu_buffer; @@ -5405,7 +5519,43 @@ rb_update_iter_read_stamp(struct ring_buffer_iter *i= ter, } =20 static struct buffer_page * -rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer) +__rb_get_reader_page_from_remote(struct ring_buffer_per_cpu *cpu_buffer) +{ + struct buffer_page *new_reader, *prev_reader; + + if (!rb_read_remote_meta_page(cpu_buffer)) + return NULL; + + /* More to read on the reader page */ + if (cpu_buffer->reader_page->read < rb_page_size(cpu_buffer->reader_page)= ) { + if (!cpu_buffer->reader_page->read) + cpu_buffer->read_stamp =3D cpu_buffer->reader_page->page->time_stamp; + return cpu_buffer->reader_page; + } + + prev_reader =3D cpu_buffer->subbuf_ids[cpu_buffer->meta_page->reader.id]; + + WARN_ON_ONCE(cpu_buffer->remote->swap_reader_page(cpu_buffer->cpu, + cpu_buffer->remote->priv)); + /* nr_pages doesn't include the reader page */ + if (WARN_ON_ONCE(cpu_buffer->meta_page->reader.id > cpu_buffer->nr_pages)) + return NULL; + + new_reader =3D cpu_buffer->subbuf_ids[cpu_buffer->meta_page->reader.id]; + + WARN_ON_ONCE(prev_reader =3D=3D new_reader); + + cpu_buffer->reader_page->page =3D new_reader->page; + cpu_buffer->reader_page->id =3D new_reader->id; + cpu_buffer->reader_page->read =3D 0; + cpu_buffer->read_stamp =3D cpu_buffer->reader_page->page->time_stamp; + cpu_buffer->lost_events =3D cpu_buffer->meta_page->reader.lost_events; + + return rb_page_size(cpu_buffer->reader_page) ? cpu_buffer->reader_page : = NULL; +} + +static struct buffer_page * +__rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer) { struct buffer_page *reader =3D NULL; unsigned long bsize =3D READ_ONCE(cpu_buffer->buffer->subbuf_size); @@ -5575,6 +5725,13 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_b= uffer) return reader; } =20 +static struct buffer_page * +rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer) +{ + return cpu_buffer->remote ? __rb_get_reader_page_from_remote(cpu_buffer) : + __rb_get_reader_page(cpu_buffer); +} + static void rb_advance_reader(struct ring_buffer_per_cpu *cpu_buffer) { struct ring_buffer_event *event; @@ -5975,7 +6132,7 @@ ring_buffer_read_start(struct trace_buffer *buffer, i= nt cpu, gfp_t flags) struct ring_buffer_per_cpu *cpu_buffer; struct ring_buffer_iter *iter; =20 - if (!cpumask_test_cpu(cpu, buffer->cpumask)) + if (!cpumask_test_cpu(cpu, buffer->cpumask) || buffer->remote) return NULL; =20 iter =3D kzalloc(sizeof(*iter), flags); @@ -6143,6 +6300,23 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer) { struct buffer_page *page; =20 + if (cpu_buffer->remote) { + if (!cpu_buffer->remote->reset) + return; + + cpu_buffer->remote->reset(cpu_buffer->cpu, cpu_buffer->remote->priv); + rb_read_remote_meta_page(cpu_buffer); + + /* Read related values, not covered by the meta-page */ + local_set(&cpu_buffer->pages_read, 0); + cpu_buffer->read =3D 0; + cpu_buffer->read_bytes =3D 0; + cpu_buffer->last_overrun =3D 0; + cpu_buffer->reader_page->read =3D 0; + + return; + } + rb_head_page_deactivate(cpu_buffer); =20 cpu_buffer->head_page @@ -6373,6 +6547,48 @@ bool ring_buffer_empty_cpu(struct trace_buffer *buff= er, int cpu) } EXPORT_SYMBOL_GPL(ring_buffer_empty_cpu); =20 +int ring_buffer_poll_remote(struct trace_buffer *buffer, int cpu) +{ + struct ring_buffer_per_cpu *cpu_buffer; + + if (cpu !=3D RING_BUFFER_ALL_CPUS) { + if (!cpumask_test_cpu(cpu, buffer->cpumask)) + return -EINVAL; + + cpu_buffer =3D buffer->buffers[cpu]; + + guard(raw_spinlock)(&cpu_buffer->reader_lock); + if (rb_read_remote_meta_page(cpu_buffer)) + rb_wakeups(buffer, cpu_buffer); + + return 0; + } + + cpus_read_lock(); + + /* + * Make sure all the ring buffers are up to date before we start reading + * them. + */ + for_each_buffer_cpu(buffer, cpu) { + cpu_buffer =3D buffer->buffers[cpu]; + + guard(raw_spinlock)(&cpu_buffer->reader_lock); + rb_read_remote_meta_page(cpu_buffer); + } + + for_each_buffer_cpu(buffer, cpu) { + cpu_buffer =3D buffer->buffers[cpu]; + + if (rb_num_of_entries(cpu_buffer)) + rb_wakeups(buffer, cpu_buffer); + } + + cpus_read_unlock(); + + return 0; +} + #ifdef CONFIG_RING_BUFFER_ALLOW_SWAP /** * ring_buffer_swap_cpu - swap a CPU buffer between two ring buffers @@ -6611,6 +6827,7 @@ int ring_buffer_read_page(struct trace_buffer *buffer, unsigned int commit; unsigned int read; u64 save_timestamp; + bool force_memcpy; =20 if (!cpumask_test_cpu(cpu, buffer->cpumask)) return -1; @@ -6648,6 +6865,8 @@ int ring_buffer_read_page(struct trace_buffer *buffer, /* Check if any events were dropped */ missed_events =3D cpu_buffer->lost_events; =20 + force_memcpy =3D cpu_buffer->mapped || cpu_buffer->remote; + /* * If this page has been partially read or * if len is not big enough to read the rest of the page or @@ -6657,7 +6876,7 @@ int ring_buffer_read_page(struct trace_buffer *buffer, */ if (read || (len < (commit - read)) || cpu_buffer->reader_page =3D=3D cpu_buffer->commit_page || - cpu_buffer->mapped) { + force_memcpy) { struct buffer_data_page *rpage =3D cpu_buffer->reader_page->page; unsigned int rpos =3D read; unsigned int pos =3D 0; @@ -7236,7 +7455,7 @@ int ring_buffer_map(struct trace_buffer *buffer, int = cpu, unsigned long flags; int err; =20 - if (!cpumask_test_cpu(cpu, buffer->cpumask)) + if (!cpumask_test_cpu(cpu, buffer->cpumask) || buffer->remote) return -EINVAL; =20 cpu_buffer =3D buffer->buffers[cpu]; --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 EC7DD352FAC for ; Sat, 31 Jan 2026 13:29:26 +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=1769866168; cv=none; b=A9LmyNB286fuRTV2UAMVF1REpgDqp7g9RVk0XGRaW+mP2858iZHgnD1b9uhU9cjHa4uTEsR/j6DoSadp7N14vsOjDm/nIUzSfLoEeWcEKtxqMHJWVZGukW8Rcr7+tgLwIngue/666/95e7mfqLHkmuqJh1Wag6IwYnp9nmkt5+Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866168; c=relaxed/simple; bh=J6SAJzYzltNTUCnsv8TPw7gsi03jbsmfcwyTa4G30y4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=DRn0hUTm2/+vlWhIfImNoDons77bdgUTdYnrdoanjbw8yi6xGqI8pZSfFx54fs1eKhFkAxMsj09iNWZgRTxRXeEZ9J/+KIBmV/T+/8WX8vauoOrye63Kg41NjTkpb0+8SyhMDV5HOj2tMaIyoAXUV7X709T7CMv5y2g97ZK0lmk= 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=Dq0c34at; 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="Dq0c34at" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4806cfffca6so32374415e9.2 for ; Sat, 31 Jan 2026 05:29:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866165; x=1770470965; 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=uj+W/fw6jviNtcb7rjWbgliWocDtdFOtxpsoa7nbJ6s=; b=Dq0c34at4EIOInPxGMpk0UV+TgFBJfW+sal6WaWU7bY0zkb2TflK7fWgKVlLPE0efh xa9W3OrlA184xTFJhMYShdRkZiNprSoHROtxoPt7jNXF3iqQv19x9eirY67ji6S8kfUB qC2I/z3I3ZF2SdqBKyQVEWE9eF3aB4QCGH1ogX+xn1eMU/tRazELNEr0Rz4DZSCjxifP GyeTzUPirQPWRPgOsW9uMahXKe6aL5vtrzuckUff14avOD4Qx00lgBnUpND3AvDCGRTR KkFjzy9sjxKfjxt6nVRDydyu0bYODOx1hlKN9G7XHXJch+vQTultmd0fzE2ROzraf7iT e9Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866165; x=1770470965; 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=uj+W/fw6jviNtcb7rjWbgliWocDtdFOtxpsoa7nbJ6s=; b=qKbte4P3dYgwqXDfeQ9+iaoiHFxGjZnDe6Xrq4draf99zIa0jjvGQJ6nTm1HE34F2o 9mj7X93UkdvYRRqGqyF3d8/7vXt1MlqHHHwZhwlToDrIoW3j9b39Ix4zPNcLqL7vzgt6 0ekvczxfjDkWuNuXxwUL9PfAsHzQqWQS38fCGrqhh7IbYswujUHnzSGT/X0+xot2e1x8 +UwuY29o+1vr9iTGscZWiiAEEu5j6N8wig98m2l6kxnzHrEQYpnTri5IAZithjIoXzTj fT7S6JozQzk7raYIXq4v/cC51kw21S3NbQZwXERt75eeaEupDpdBYC/y5s7CsmRBflQ8 YdpQ== X-Forwarded-Encrypted: i=1; AJvYcCVAWPPP+FzxwTa+WHjrYk2dH1qbXuBapEMvGP7B3vgW8fp7HZwYS4kHbKgeN2vm4snmu8MePE0DnAlkQj8=@vger.kernel.org X-Gm-Message-State: AOJu0YxO6DlP0okZcXtKO7OZSveIFxq0KCdnqFBFFrwsDFPcg/0MrIqU py4OFEGNcTq2yZDFXjG22uzpVgkG7Isq7Fu0afpdko6cMn05uztS+AjjHci6dYYXeco/VyhU7Y8 XPL/1Dawjc+7QH4Z3y+HMug== X-Received: from wmju1.prod.google.com ([2002:a7b:cb01:0:b0:480:6b8b:a7ab]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:8b42:b0:477:5af7:6fa with SMTP id 5b1f17b1804b1-482db49728bmr62880405e9.32.1769866165397; Sat, 31 Jan 2026 05:29:25 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:22 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-5-vdonnefort@google.com> Subject: [PATCH v11 04/30] ring-buffer: Add non-consuming read for ring-buffer remotes From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Hopefully, the remote will only swap pages on the kernel instruction (via the swap_reader_page() callback). This means we know at what point the ring-buffer geometry has changed. It is therefore possible to rearrange the kernel view of that ring-buffer to allow non-consuming read. Reviewed-by: Steven Rostedt (Google) Signed-off-by: Vincent Donnefort diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 00754339733d..2d08dd326309 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -5365,10 +5365,51 @@ static bool rb_read_remote_meta_page(struct ring_bu= ffer_per_cpu *cpu_buffer) return rb_num_of_entries(cpu_buffer); } =20 +static void rb_update_remote_head(struct ring_buffer_per_cpu *cpu_buffer) +{ + struct buffer_page *next, *orig; + int retry =3D 3; + + orig =3D next =3D cpu_buffer->head_page; + rb_inc_page(&next); + + /* Run after the writer */ + while (cpu_buffer->head_page->page->time_stamp > next->page->time_stamp) { + rb_inc_page(&next); + + rb_list_head_clear(cpu_buffer->head_page->list.prev); + rb_inc_page(&cpu_buffer->head_page); + rb_set_list_to_head(cpu_buffer->head_page->list.prev); + + if (cpu_buffer->head_page =3D=3D orig) { + if (WARN_ON_ONCE(!(--retry))) + return; + } + } + + orig =3D cpu_buffer->commit_page =3D cpu_buffer->head_page; + retry =3D 3; + + while (cpu_buffer->commit_page->page->time_stamp < next->page->time_stamp= ) { + rb_inc_page(&next); + rb_inc_page(&cpu_buffer->commit_page); + + if (cpu_buffer->commit_page =3D=3D orig) { + if (WARN_ON_ONCE(!(--retry))) + return; + } + } +} + static void rb_iter_reset(struct ring_buffer_iter *iter) { struct ring_buffer_per_cpu *cpu_buffer =3D iter->cpu_buffer; =20 + if (cpu_buffer->remote) { + rb_read_remote_meta_page(cpu_buffer); + rb_update_remote_head(cpu_buffer); + } + /* Iterator usage is expected to have record disabled */ iter->head_page =3D cpu_buffer->reader_page; iter->head =3D cpu_buffer->reader_page->read; @@ -5521,7 +5562,7 @@ rb_update_iter_read_stamp(struct ring_buffer_iter *it= er, static struct buffer_page * __rb_get_reader_page_from_remote(struct ring_buffer_per_cpu *cpu_buffer) { - struct buffer_page *new_reader, *prev_reader; + struct buffer_page *new_reader, *prev_reader, *prev_head, *new_head, *las= t; =20 if (!rb_read_remote_meta_page(cpu_buffer)) return NULL; @@ -5545,10 +5586,32 @@ __rb_get_reader_page_from_remote(struct ring_buffer= _per_cpu *cpu_buffer) =20 WARN_ON_ONCE(prev_reader =3D=3D new_reader); =20 - cpu_buffer->reader_page->page =3D new_reader->page; - cpu_buffer->reader_page->id =3D new_reader->id; - cpu_buffer->reader_page->read =3D 0; - cpu_buffer->read_stamp =3D cpu_buffer->reader_page->page->time_stamp; + prev_head =3D new_reader; /* New reader was also the previous head */ + new_head =3D prev_head; + rb_inc_page(&new_head); + last =3D prev_head; + rb_dec_page(&last); + + /* Clear the old HEAD flag */ + rb_list_head_clear(cpu_buffer->head_page->list.prev); + + prev_reader->list.next =3D prev_head->list.next; + prev_reader->list.prev =3D prev_head->list.prev; + + /* Swap prev_reader with new_reader */ + last->list.next =3D &prev_reader->list; + new_head->list.prev =3D &prev_reader->list; + + new_reader->list.prev =3D &new_reader->list; + new_reader->list.next =3D &new_head->list; + + /* Reactivate the HEAD flag */ + rb_set_list_to_head(&last->list); + + cpu_buffer->head_page =3D new_head; + cpu_buffer->reader_page =3D new_reader; + cpu_buffer->pages =3D &new_head->list; + cpu_buffer->read_stamp =3D new_reader->page->time_stamp; cpu_buffer->lost_events =3D cpu_buffer->meta_page->reader.lost_events; =20 return rb_page_size(cpu_buffer->reader_page) ? cpu_buffer->reader_page : = NULL; @@ -6132,7 +6195,7 @@ ring_buffer_read_start(struct trace_buffer *buffer, i= nt cpu, gfp_t flags) struct ring_buffer_per_cpu *cpu_buffer; struct ring_buffer_iter *iter; =20 - if (!cpumask_test_cpu(cpu, buffer->cpumask) || buffer->remote) + if (!cpumask_test_cpu(cpu, buffer->cpumask)) return NULL; =20 iter =3D kzalloc(sizeof(*iter), flags); --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 ED973353EDF for ; Sat, 31 Jan 2026 13:29:27 +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=1769866171; cv=none; b=GwXW7IGcu9rzBTVl5bSyAugSpU2PPDfO+JQuFvEm8yjvTzAQUi4colgWi9Mg/E0AfwmIkqjy5UGZegoZIQKjGqqlfmwa0I2nSY/IEGJshJn8g6+WPU3cqkyOFIEV+u1uQ/s8EtJtGK17ej0rX0y7vq/BkLPoSpkVCVT8V32iZzQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866171; c=relaxed/simple; bh=A/ZCxYtdHkAFn+S3Ay6iP6Ym8hJ2xDAvw+2Aq53eaaA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gKSOKSDP8vb2m7lCO4LdirqckH07ArvjESH3yx5tUFa1RJ5WlwtNHPPtfHrIXO2U3/Z+9hDfQiV8mjFREOScInDX7jZ2mwo6pgLEGzbru1dlVSwo5Bq+rFGfheZH+O/ccCb9pkJzbm4smjDa0y0YiuXS6nGgVp+Z1tP1OTBdQF0= 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=X/as7dVT; 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="X/as7dVT" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-4358f1c082eso2416554f8f.1 for ; Sat, 31 Jan 2026 05:29:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866166; x=1770470966; 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=gGLsmU2TrwbEs5UPqim9wQWKvTlIsdJqY57Big/qB1c=; b=X/as7dVTDfcDOgm+LUOe2a0ghb+Hz8RQBLGxCGPBf1ynLZtXG3jox59W5yF4AQFLS3 IVG8icDeJYMyxwITdcY3VcOPFpcPJ4uPDL22ys9qgfuKovJpAZzyDL2gQsZ9BEzBkp9Y UHjuZ1S8PfYUaNWG59qkujT4wJD2qrSP+eqZr7DJow2RzKiQoLXnPHExpHrLnBbjID/z xmKMIRLp2WKsIA87ZRSH8tsm5+80l9XAQKF105on+ryAVyP95fVpheaP0hEuH5w6obpU LepDrr6mS3mV4gxzzCfjW1YwI8dUdrAhlGDTOc4nL5HtiN6cME3IRMHfLXBHDTJiMrtN /l3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866166; x=1770470966; 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=gGLsmU2TrwbEs5UPqim9wQWKvTlIsdJqY57Big/qB1c=; b=QFN/Q2rrna6DDZD59B1HlAuDWG3UgjsTuf6k4uwpgru48rIKhNC8egYQEbyO9rSoH2 p181aKVNc/6tdF4xeWjRGt4BdeYL9yCc4iL6Z8Qcnte0q1+fek8irEuWT0mthHQWJp1o uQGx0LpW4bZtyryo5yE70DXvZkpVz1ncN2bgZ+FX14flhqaiBRJOXQMGp/1FRXGQabQn 17w8Oc8vPLfOgAX7mc6BHAzAyLm1qWmcX/2AJhxp3vLLBPIRo8/Eodqan3RdjAWuf8U5 RYrR63HwC+JI4eOnw9E3/iPHDg7BX7+rMPYfU+59f28r7Gtxq3t/zaIUjhpxRYks0k6e Bz/Q== X-Forwarded-Encrypted: i=1; AJvYcCWXsbJFRgGVuxVyy0aHgoKNq8yhUr1ZgVtrwkHHXZ/rO1KcoaiMwsPivGkJww6NvQB3dlWSyENsYVlTiMI=@vger.kernel.org X-Gm-Message-State: AOJu0YyelWJH0DQhRv40Po2yQ4T7GUX4K9JMREX4R26gp9DOCxBbhQVB /pTHkqLTXF9+/vSgvytjlnjCmYidDFWTcz4MkPyU5k/9anmUD/hqVHtBf9gJymNZ/O4N09Nb4nh tENQEVFAVamCjbK7s8IdBhA== X-Received: from wrbcc2.prod.google.com ([2002:a5d:5c02:0:b0:435:a3c2:4195]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:40c9:b0:431:771:a50c with SMTP id ffacd0b85a97d-435ea05d703mr13274373f8f.1.1769866166108; Sat, 31 Jan 2026 05:29:26 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:23 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-6-vdonnefort@google.com> Subject: [PATCH v11 05/30] tracing: Introduce 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, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A trace remote relies on ring-buffer remotes to read and control compatible tracing buffers, written by entity such as firmware or hypervisor. Add a Tracefs directory remotes/ that contains all instances of trace remotes. Each instance follows the same hierarchy as any other to ease the support by existing user-space tools. This currently does not provide any event support, which will come later. Signed-off-by: Vincent Donnefort diff --git a/include/linux/trace_remote.h b/include/linux/trace_remote.h new file mode 100644 index 000000000000..bd327a8184a0 --- /dev/null +++ b/include/linux/trace_remote.h @@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _LINUX_TRACE_REMOTE_H +#define _LINUX_TRACE_REMOTE_H + +#include + +/** + * struct trace_remote_callbacks - Callbacks used by Tracefs to control th= e remote + * + * @load_trace_buffer: Called before Tracefs accesses the trace buffer fo= r the first + * time. Must return a &trace_buffer_desc + * (most likely filled with trace_remote_alloc_buffer()) + * @unload_trace_buffer: + * Called once Tracefs has no use for the trace buffer + * (most likely call trace_remote_free_buffer()) + * @enable_tracing: Called on Tracefs tracing_on. It is expected from the + * remote to allow writing. + * @swap_reader_page: Called when Tracefs consumes a new page from a + * ring-buffer. It is expected from the remote to isolate a + * new reader-page from the @cpu ring-buffer. + */ +struct trace_remote_callbacks { + struct trace_buffer_desc *(*load_trace_buffer)(unsigned long size, void *= priv); + void (*unload_trace_buffer)(struct trace_buffer_desc *desc, void *priv); + int (*enable_tracing)(bool enable, void *priv); + int (*swap_reader_page)(unsigned int cpu, void *priv); +}; + +int trace_remote_register(const char *name, struct trace_remote_callbacks = *cbs, void *priv); + +int trace_remote_alloc_buffer(struct trace_buffer_desc *desc, size_t desc_= size, size_t buffer_size, + const struct cpumask *cpumask); + +void trace_remote_free_buffer(struct trace_buffer_desc *desc); + +#endif diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index bfa2ec46e075..135edf143073 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -1278,4 +1278,7 @@ config HIST_TRIGGERS_DEBUG =20 source "kernel/trace/rv/Kconfig" =20 +config TRACE_REMOTE + bool + endif # FTRACE diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index fc5dcc888e13..6e75d710fc25 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile @@ -127,4 +127,5 @@ obj-$(CONFIG_FPROBE_EVENTS) +=3D trace_fprobe.o obj-$(CONFIG_TRACEPOINT_BENCHMARK) +=3D trace_benchmark.o obj-$(CONFIG_RV) +=3D rv/ =20 +obj-$(CONFIG_TRACE_REMOTE) +=3D trace_remote.o libftrace-y :=3D ftrace.o diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 8bd4ec08fb36..1fcbdea992d2 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -9356,7 +9356,7 @@ static struct dentry *tracing_dentry_percpu(struct tr= ace_array *tr, int cpu) return tr->percpu_dir; } =20 -static struct dentry * +struct dentry * trace_create_cpu_file(const char *name, umode_t mode, struct dentry *paren= t, void *data, long cpu, const struct file_operations *fops) { diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index b6d42fe06115..fdbcd068ba38 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -680,6 +680,12 @@ struct dentry *trace_create_file(const char *name, struct dentry *parent, void *data, const struct file_operations *fops); +struct dentry *trace_create_cpu_file(const char *name, + umode_t mode, + struct dentry *parent, + void *data, + long cpu, + const struct file_operations *fops); =20 =20 /** diff --git a/kernel/trace/trace_remote.c b/kernel/trace/trace_remote.c new file mode 100644 index 000000000000..f8ab328df70a --- /dev/null +++ b/kernel/trace/trace_remote.c @@ -0,0 +1,623 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2025 - Google LLC + * Author: Vincent Donnefort + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "trace.h" + +#define TRACEFS_DIR "remotes" +#define TRACEFS_MODE_WRITE 0640 +#define TRACEFS_MODE_READ 0440 + +struct trace_remote_iterator { + struct trace_remote *remote; + struct trace_seq seq; + struct delayed_work poll_work; + unsigned long lost_events; + u64 ts; + int cpu; + int evt_cpu; +}; + +struct trace_remote { + struct trace_remote_callbacks *cbs; + void *priv; + struct trace_buffer *trace_buffer; + struct trace_buffer_desc *trace_buffer_desc; + unsigned long trace_buffer_size; + struct ring_buffer_remote rb_remote; + struct mutex lock; + unsigned int nr_readers; + unsigned int poll_ms; + bool tracing_on; +}; + +static bool trace_remote_loaded(struct trace_remote *remote) +{ + return !!remote->trace_buffer; +} + +static int trace_remote_load(struct trace_remote *remote) +{ + struct ring_buffer_remote *rb_remote =3D &remote->rb_remote; + struct trace_buffer_desc *desc; + + lockdep_assert_held(&remote->lock); + + if (trace_remote_loaded(remote)) + return 0; + + desc =3D remote->cbs->load_trace_buffer(remote->trace_buffer_size, remote= ->priv); + if (IS_ERR(desc)) + return PTR_ERR(desc); + + rb_remote->desc =3D desc; + rb_remote->swap_reader_page =3D remote->cbs->swap_reader_page; + rb_remote->priv =3D remote->priv; + remote->trace_buffer =3D ring_buffer_alloc_remote(rb_remote); + if (!remote->trace_buffer) { + remote->cbs->unload_trace_buffer(desc, remote->priv); + return -ENOMEM; + } + + remote->trace_buffer_desc =3D desc; + + return 0; +} + +static void trace_remote_try_unload(struct trace_remote *remote) +{ + lockdep_assert_held(&remote->lock); + + if (!trace_remote_loaded(remote)) + return; + + /* The buffer is being read or writable */ + if (remote->nr_readers || remote->tracing_on) + return; + + /* The buffer has readable data */ + if (!ring_buffer_empty(remote->trace_buffer)) + return; + + ring_buffer_free(remote->trace_buffer); + remote->trace_buffer =3D NULL; + remote->cbs->unload_trace_buffer(remote->trace_buffer_desc, remote->priv); +} + +static int trace_remote_enable_tracing(struct trace_remote *remote) +{ + int ret; + + lockdep_assert_held(&remote->lock); + + if (remote->tracing_on) + return 0; + + ret =3D trace_remote_load(remote); + if (ret) + return ret; + + ret =3D remote->cbs->enable_tracing(true, remote->priv); + if (ret) { + trace_remote_try_unload(remote); + return ret; + } + + remote->tracing_on =3D true; + + return 0; +} + +static int trace_remote_disable_tracing(struct trace_remote *remote) +{ + int ret; + + lockdep_assert_held(&remote->lock); + + if (!remote->tracing_on) + return 0; + + ret =3D remote->cbs->enable_tracing(false, remote->priv); + if (ret) + return ret; + + ring_buffer_poll_remote(remote->trace_buffer, RING_BUFFER_ALL_CPUS); + remote->tracing_on =3D false; + trace_remote_try_unload(remote); + + return 0; +} + +static ssize_t +tracing_on_write(struct file *filp, const char __user *ubuf, size_t cnt, l= off_t *ppos) +{ + struct trace_remote *remote =3D filp->private_data; + unsigned long val; + int ret; + + ret =3D kstrtoul_from_user(ubuf, cnt, 10, &val); + if (ret) + return ret; + + guard(mutex)(&remote->lock); + + ret =3D val ? trace_remote_enable_tracing(remote) : trace_remote_disable_= tracing(remote); + if (ret) + return ret; + + return cnt; +} +static int tracing_on_show(struct seq_file *s, void *unused) +{ + struct trace_remote *remote =3D s->private; + + seq_printf(s, "%d\n", remote->tracing_on); + + return 0; +} +DEFINE_SHOW_STORE_ATTRIBUTE(tracing_on); + +static ssize_t buffer_size_kb_write(struct file *filp, const char __user *= ubuf, size_t cnt, + loff_t *ppos) +{ + struct trace_remote *remote =3D filp->private_data; + unsigned long val; + int ret; + + ret =3D kstrtoul_from_user(ubuf, cnt, 10, &val); + if (ret) + return ret; + + /* KiB to Bytes */ + if (!val || check_shl_overflow(val, 10, &val)) + return -EINVAL; + + guard(mutex)(&remote->lock); + + if (trace_remote_loaded(remote)) + return -EBUSY; + + remote->trace_buffer_size =3D val; + + return cnt; +} + +static int buffer_size_kb_show(struct seq_file *s, void *unused) +{ + struct trace_remote *remote =3D s->private; + + seq_printf(s, "%lu (%s)\n", remote->trace_buffer_size >> 10, + trace_remote_loaded(remote) ? "loaded" : "unloaded"); + + return 0; +} +DEFINE_SHOW_STORE_ATTRIBUTE(buffer_size_kb); + +static int trace_remote_get(struct trace_remote *remote, int cpu) +{ + int ret; + + if (remote->nr_readers =3D=3D UINT_MAX) + return -EBUSY; + + ret =3D trace_remote_load(remote); + if (ret) + return ret; + + remote->nr_readers++; + + return 0; +} + +static void trace_remote_put(struct trace_remote *remote) +{ + if (WARN_ON(!remote->nr_readers)) + return; + + remote->nr_readers--; + if (remote->nr_readers) + return; + + trace_remote_try_unload(remote); +} + +static void __poll_remote(struct work_struct *work) +{ + struct delayed_work *dwork =3D to_delayed_work(work); + struct trace_remote_iterator *iter; + + iter =3D container_of(dwork, struct trace_remote_iterator, poll_work); + ring_buffer_poll_remote(iter->remote->trace_buffer, iter->cpu); + schedule_delayed_work((struct delayed_work *)work, + msecs_to_jiffies(iter->remote->poll_ms)); +} + +static struct trace_remote_iterator *trace_remote_iter(struct trace_remote= *remote, int cpu) +{ + struct trace_remote_iterator *iter =3D NULL; + int ret; + + lockdep_assert_held(&remote->lock); + + + ret =3D trace_remote_get(remote, cpu); + if (ret) + return ERR_PTR(ret); + + /* Test the CPU */ + ret =3D ring_buffer_poll_remote(remote->trace_buffer, cpu); + if (ret) + goto err; + + iter =3D kzalloc(sizeof(*iter), GFP_KERNEL); + if (iter) { + iter->remote =3D remote; + iter->cpu =3D cpu; + trace_seq_init(&iter->seq); + INIT_DELAYED_WORK(&iter->poll_work, __poll_remote); + schedule_delayed_work(&iter->poll_work, msecs_to_jiffies(remote->poll_ms= )); + + return iter; + } + ret =3D -ENOMEM; + +err: + kfree(iter); + trace_remote_put(remote); + + return ERR_PTR(ret); +} + +static void trace_remote_iter_free(struct trace_remote_iterator *iter) +{ + struct trace_remote *remote; + + if (!iter) + return; + + remote =3D iter->remote; + + lockdep_assert_held(&remote->lock); + + kfree(iter); + trace_remote_put(remote); +} + +static bool trace_remote_iter_read_event(struct trace_remote_iterator *ite= r) +{ + struct trace_buffer *trace_buffer =3D iter->remote->trace_buffer; + int cpu =3D iter->cpu; + + if (cpu !=3D RING_BUFFER_ALL_CPUS) { + if (ring_buffer_empty_cpu(trace_buffer, cpu)) + return false; + + if (!ring_buffer_peek(trace_buffer, cpu, &iter->ts, &iter->lost_events)) + return false; + + iter->evt_cpu =3D cpu; + return true; + } + + iter->ts =3D U64_MAX; + for_each_possible_cpu(cpu) { + unsigned long lost_events; + u64 ts; + + if (ring_buffer_empty_cpu(trace_buffer, cpu)) + continue; + + if (!ring_buffer_peek(trace_buffer, cpu, &ts, &lost_events)) + continue; + + if (ts >=3D iter->ts) + continue; + + iter->ts =3D ts; + iter->evt_cpu =3D cpu; + iter->lost_events =3D lost_events; + } + + return iter->ts !=3D U64_MAX; +} + +static int trace_remote_iter_print_event(struct trace_remote_iterator *ite= r) +{ + unsigned long usecs_rem; + u64 ts =3D iter->ts; + + if (iter->lost_events) + trace_seq_printf(&iter->seq, "CPU:%d [LOST %lu EVENTS]\n", + iter->evt_cpu, iter->lost_events); + + do_div(ts, 1000); + usecs_rem =3D do_div(ts, USEC_PER_SEC); + + trace_seq_printf(&iter->seq, "[%03d]\t%5llu.%06lu: ", iter->evt_cpu, + ts, usecs_rem); + + return trace_seq_has_overflowed(&iter->seq) ? -EOVERFLOW : 0; +} + +static int trace_pipe_open(struct inode *inode, struct file *filp) +{ + struct trace_remote *remote =3D inode->i_private; + struct trace_remote_iterator *iter; + int cpu =3D RING_BUFFER_ALL_CPUS; + + if (inode->i_cdev) + cpu =3D (long)inode->i_cdev - 1; + + guard(mutex)(&remote->lock); + iter =3D trace_remote_iter(remote, cpu); + filp->private_data =3D iter; + + return IS_ERR(iter) ? PTR_ERR(iter) : 0; +} + +static int trace_pipe_release(struct inode *inode, struct file *filp) +{ + struct trace_remote_iterator *iter =3D filp->private_data; + struct trace_remote *remote =3D iter->remote; + + guard(mutex)(&remote->lock); + + trace_remote_iter_free(iter); + + return 0; +} + +static ssize_t trace_pipe_read(struct file *filp, char __user *ubuf, size_= t cnt, loff_t *ppos) +{ + struct trace_remote_iterator *iter =3D filp->private_data; + struct trace_buffer *trace_buffer =3D iter->remote->trace_buffer; + int ret; + +copy_to_user: + ret =3D trace_seq_to_user(&iter->seq, ubuf, cnt); + if (ret !=3D -EBUSY) + return ret; + + trace_seq_init(&iter->seq); + + ret =3D ring_buffer_wait(trace_buffer, iter->cpu, 0, NULL, NULL); + if (ret < 0) + return ret; + + while (trace_remote_iter_read_event(iter)) { + int prev_len =3D iter->seq.seq.len; + + if (trace_remote_iter_print_event(iter)) { + iter->seq.seq.len =3D prev_len; + break; + } + + ring_buffer_consume(trace_buffer, iter->evt_cpu, NULL, NULL); + } + + goto copy_to_user; +} + +static const struct file_operations trace_pipe_fops =3D { + .open =3D trace_pipe_open, + .read =3D trace_pipe_read, + .release =3D trace_pipe_release, +}; + +static int trace_remote_init_tracefs(const char *name, struct trace_remote= *remote) +{ + struct dentry *remote_d, *percpu_d, *d; + static struct dentry *root; + static DEFINE_MUTEX(lock); + bool root_inited =3D false; + int cpu; + + guard(mutex)(&lock); + + if (!root) { + root =3D tracefs_create_dir(TRACEFS_DIR, NULL); + if (!root) { + pr_err("Failed to create tracefs dir "TRACEFS_DIR"\n"); + return -ENOMEM; + } + root_inited =3D true; + } + + remote_d =3D tracefs_create_dir(name, root); + if (!remote_d) { + pr_err("Failed to create tracefs dir "TRACEFS_DIR"%s/\n", name); + goto err; + } + + d =3D trace_create_file("tracing_on", TRACEFS_MODE_WRITE, remote_d, remot= e, &tracing_on_fops); + if (!d) + goto err; + + d =3D trace_create_file("buffer_size_kb", TRACEFS_MODE_WRITE, remote_d, r= emote, + &buffer_size_kb_fops); + if (!d) + goto err; + + d =3D trace_create_file("trace_pipe", TRACEFS_MODE_READ, remote_d, remote= , &trace_pipe_fops); + if (!d) + goto err; + + percpu_d =3D tracefs_create_dir("per_cpu", remote_d); + if (!percpu_d) { + pr_err("Failed to create tracefs dir "TRACEFS_DIR"%s/per_cpu/\n", name); + goto err; + } + + for_each_possible_cpu(cpu) { + struct dentry *cpu_d; + char cpu_name[16]; + + snprintf(cpu_name, sizeof(cpu_name), "cpu%d", cpu); + cpu_d =3D tracefs_create_dir(cpu_name, percpu_d); + if (!cpu_d) { + pr_err("Failed to create tracefs dir "TRACEFS_DIR"%s/percpu/cpu%d\n", + name, cpu); + goto err; + } + + d =3D trace_create_cpu_file("trace_pipe", TRACEFS_MODE_READ, cpu_d, remo= te, cpu, + &trace_pipe_fops); + if (!d) + goto err; + } + + return 0; + +err: + if (root_inited) { + tracefs_remove(root); + root =3D NULL; + } else { + tracefs_remove(remote_d); + } + + return -ENOMEM; +} + +/** + * trace_remote_register() - Register a Tracefs remote + * + * A trace remote is an entity, outside of the kernel (most likely firmwar= e or + * hypervisor) capable of writing events into a Tracefs compatible ring-bu= ffer. + * The kernel would then act as a reader. + * + * The registered remote will be found under the Tracefs directory + * remotes/. + * + * @name: Name of the remote, used for the Tracefs remotes/ directory. + * @cbs: Set of callbacks used to control the remote. + * @priv: Private data, passed to each callback from @cbs. + * @events: Array of events. &remote_event.name and &remote_event.id must = be + * filled by the caller. + * @nr_events: Number of events in the @events array. + * + * Return: 0 on success, negative error code on failure. + */ +int trace_remote_register(const char *name, struct trace_remote_callbacks = *cbs, void *priv) +{ + struct trace_remote *remote; + + remote =3D kzalloc(sizeof(*remote), GFP_KERNEL); + if (!remote) + return -ENOMEM; + + remote->cbs =3D cbs; + remote->priv =3D priv; + remote->trace_buffer_size =3D 7 << 10; + remote->poll_ms =3D 100; + mutex_init(&remote->lock); + + if (trace_remote_init_tracefs(name, remote)) { + kfree(remote); + return -ENOMEM; + } + + return 0; +} +EXPORT_SYMBOL_GPL(trace_remote_register); + +/** + * trace_remote_free_buffer() - Free trace buffer allocated with + * trace_remote_alloc_buffer() + * + * Most likely called from &trace_remote_callbacks.unload_trace_buffer. + * + * @desc: Descriptor of the per-CPU ring-buffers, originally filled by + * trace_remote_alloc_buffer() + */ +void trace_remote_free_buffer(struct trace_buffer_desc *desc) +{ + struct ring_buffer_desc *rb_desc; + int cpu; + + for_each_ring_buffer_desc(rb_desc, cpu, desc) { + unsigned int id; + + free_page(rb_desc->meta_va); + + for (id =3D 0; id < rb_desc->nr_page_va; id++) + free_page(rb_desc->page_va[id]); + } +} +EXPORT_SYMBOL_GPL(trace_remote_free_buffer); + +/** + * trace_remote_alloc_buffer() - Dynamically allocate a trace buffer + * + * Helper to dynamically allocate a set of pages (enough to cover @buffer_= size) + * for each CPU from @cpumask and fill @desc. Most likely called from + * &trace_remote_callbacks.load_trace_buffer. + * + * @desc: Uninitialized trace_buffer_desc + * @desc_size: Size of the trace_buffer_desc. Must be at least equal to + * trace_buffer_desc_size() + * @buffer_size: Size in bytes of each per-CPU ring-buffer + * @cpumask: CPUs to allocate a ring-buffer for + * + * Return: 0 on success, negative error code on failure. + */ +int trace_remote_alloc_buffer(struct trace_buffer_desc *desc, size_t desc_= size, size_t buffer_size, + const struct cpumask *cpumask) +{ + unsigned int nr_pages =3D max(DIV_ROUND_UP(buffer_size, PAGE_SIZE), 2UL) = + 1; + void *desc_end =3D desc + desc_size; + struct ring_buffer_desc *rb_desc; + int cpu, ret =3D -ENOMEM; + + if (desc_size < struct_size(desc, __data, 0)) + return -EINVAL; + + desc->nr_cpus =3D 0; + desc->struct_len =3D struct_size(desc, __data, 0); + + rb_desc =3D (struct ring_buffer_desc *)&desc->__data[0]; + + for_each_cpu(cpu, cpumask) { + unsigned int id; + + if ((void *)rb_desc + struct_size(rb_desc, page_va, nr_pages) > desc_end= ) { + ret =3D -EINVAL; + goto err; + } + + rb_desc->cpu =3D cpu; + rb_desc->nr_page_va =3D 0; + rb_desc->meta_va =3D (unsigned long)__get_free_page(GFP_KERNEL); + if (!rb_desc->meta_va) + goto err; + + for (id =3D 0; id < nr_pages; id++) { + rb_desc->page_va[id] =3D (unsigned long)__get_free_page(GFP_KERNEL); + if (!rb_desc->page_va[id]) + goto err; + + rb_desc->nr_page_va++; + } + desc->nr_cpus++; + desc->struct_len +=3D offsetof(struct ring_buffer_desc, page_va); + desc->struct_len +=3D struct_size(rb_desc, page_va, rb_desc->nr_page_va); + rb_desc =3D __next_ring_buffer_desc(rb_desc); + } + + return 0; + +err: + trace_remote_free_buffer(desc); + return ret; +} +EXPORT_SYMBOL_GPL(trace_remote_alloc_buffer); --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 C370D3542CC for ; Sat, 31 Jan 2026 13:29:28 +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=1769866170; cv=none; b=IpL6mxG2A0YoOEuYSFvQi5hADHRrxOxJXOJnGK0Rd3KlXMhYldenAYgVUhRNv3R9RSTv2l4AfsYqkEm4ba/DQ5ozo06mro8kve9rJyWEl5g28V30DK0AoxZNRoHd9MBbqvXV1x9CLZITYNUS/ElOfS2uBV7+w66acPtgdXZw8Fk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866170; c=relaxed/simple; bh=2ARo2SiydEoEnxginXLlK5ytsAnPW1RAxdvwdzQPGBc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=K90WhJKUCHD3Sh6wuBPrU/nlKm3fHn2k3nsOQaQKeQDWn7ni2eHo54SHKMsivwGZc60kEUnXFXmXbf0eDo//c+OjnK1MzN2veb2OAY8MBYvTDJoBqiDENFmFsy5/TmePXOUQA5CIoEBLKeT/3+Pu8/Sja5akEixS/jrLJKRVll4= 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=p54A7Sj/; 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="p54A7Sj/" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-482eec44485so2165075e9.3 for ; Sat, 31 Jan 2026 05:29:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866167; x=1770470967; 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=ERRzO3AEMEo0ywt1F8tEw+KoWErOg0ckwY8dacZ6eiw=; b=p54A7Sj/2HN0Fmi7hlvkFHS3i4v/vQ/YK4S6jksbAZJOTtHW9i11jbxGNVtHI+bJxn e3CBdjMrmLXKS2PDEM7PH8ZJn+IclxSsii1EC8kkYPKI2orn4e6XAAAScdrlekgECi+P XSEKraGTs05v3cBryokKrT2IZp3+yXPgsSY9aZhWhv+JKmnnCTVJO4KZBT0sMaslD0jh vJ4lORHsgYBM1HNzpO17Z7Qo9u5uY3rFLK6ER/wX/NralghqlLXkSGyWBLWuGJeEDxWc /y+FWveOFyE9JaaI10Vc87epoe9AEHiwfu2vd9q7u8FI1P1r0W+R1GO8jEVdqwWay6rL z9VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866167; x=1770470967; 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=ERRzO3AEMEo0ywt1F8tEw+KoWErOg0ckwY8dacZ6eiw=; b=PaEyVHwoK6bnHRrg69bNfOWWNCk7LKW7HwqAwor4D0Wr/53UCXyzFnjoia4tNraTCX rhlcJ4r3/OxD+dYGcERWHCOhjmN9K6DH+1HM6hpOsY2Os3flE8fbjJROSITK6z3IJOb7 S172fgQrYajAl/d64I42n8FJAeWv75ZPvB+5RGCF7K3tvIEAAfkLUiuCqXd/loJB144J vF5OiTNnZASCpXb/rcFtu0hxHrqqze6z5HWezP050mseTvpof1kJBHk6FYvYxgn8Rowx ilnyDzInxTqonZb04qTo57puqvJISNTHnTo6KWam9I+Q1oy2s/5hGEq21En4p3txCbUB +Dyg== X-Forwarded-Encrypted: i=1; AJvYcCV5yQ7BVq5I/qoWq4r3AoWPBgvBFA0Nv9mHRPhscdG79QsFzFqnXWSa4MzRjVe+i51FJTOFZIMvZkK2nBU=@vger.kernel.org X-Gm-Message-State: AOJu0Yzb30eFNmkuKOvsWLgqnYw7ghElDiwQPuBEyHBtFMOkaHUC5I+G hrDIAxe+NXSnybBIapb4x4EQoRR9PCGaqk0L6Q93m5OlRAKL7OUMo5eiA21xxsFZY4LXR0lWA8u fSQb4wdy11PRSlyawe6bjWQ== X-Received: from wmqu15.prod.google.com ([2002:a05:600c:19cf:b0:477:a0a1:eae8]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1e24:b0:480:6a46:3616 with SMTP id 5b1f17b1804b1-482db448890mr79441815e9.4.1769866167109; Sat, 31 Jan 2026 05:29:27 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:24 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-7-vdonnefort@google.com> Subject: [PATCH v11 06/30] tracing: Add reset to 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, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Allow to reset the trace remote buffer by writing to the Tracefs "trace" file. This is similar to the regular Tracefs interface. Reviewed-by: Steven Rostedt (Google) Signed-off-by: Vincent Donnefort diff --git a/include/linux/trace_remote.h b/include/linux/trace_remote.h index bd327a8184a0..7fb5271a8c30 100644 --- a/include/linux/trace_remote.h +++ b/include/linux/trace_remote.h @@ -18,6 +18,8 @@ * remote to allow writing. * @swap_reader_page: Called when Tracefs consumes a new page from a * ring-buffer. It is expected from the remote to isolate a + * @reset: Called on `echo 0 > trace`. It is expected from the + * remote to reset all ring-buffer pages. * new reader-page from the @cpu ring-buffer. */ struct trace_remote_callbacks { @@ -25,6 +27,7 @@ struct trace_remote_callbacks { void (*unload_trace_buffer)(struct trace_buffer_desc *desc, void *priv); int (*enable_tracing)(bool enable, void *priv); int (*swap_reader_page)(unsigned int cpu, void *priv); + int (*reset)(unsigned int cpu, void *priv); }; =20 int trace_remote_register(const char *name, struct trace_remote_callbacks = *cbs, void *priv); diff --git a/kernel/trace/trace_remote.c b/kernel/trace/trace_remote.c index f8ab328df70a..82060bb19ba1 100644 --- a/kernel/trace/trace_remote.c +++ b/kernel/trace/trace_remote.c @@ -63,6 +63,7 @@ static int trace_remote_load(struct trace_remote *remote) rb_remote->desc =3D desc; rb_remote->swap_reader_page =3D remote->cbs->swap_reader_page; rb_remote->priv =3D remote->priv; + rb_remote->reset =3D remote->cbs->reset; remote->trace_buffer =3D ring_buffer_alloc_remote(rb_remote); if (!remote->trace_buffer) { remote->cbs->unload_trace_buffer(desc, remote->priv); @@ -138,6 +139,21 @@ static int trace_remote_disable_tracing(struct trace_r= emote *remote) return 0; } =20 +static void trace_remote_reset(struct trace_remote *remote, int cpu) +{ + lockdep_assert_held(&remote->lock); + + if (!trace_remote_loaded(remote)) + return; + + if (cpu =3D=3D RING_BUFFER_ALL_CPUS) + ring_buffer_reset(remote->trace_buffer); + else + ring_buffer_reset_cpu(remote->trace_buffer, cpu); + + trace_remote_try_unload(remote); +} + static ssize_t tracing_on_write(struct file *filp, const char __user *ubuf, size_t cnt, l= off_t *ppos) { @@ -414,6 +430,26 @@ static const struct file_operations trace_pipe_fops = =3D { .release =3D trace_pipe_release, }; =20 +static ssize_t trace_write(struct file *filp, const char __user *ubuf, siz= e_t cnt, loff_t *ppos) +{ + struct inode *inode =3D file_inode(filp); + struct trace_remote *remote =3D inode->i_private; + int cpu =3D RING_BUFFER_ALL_CPUS; + + if (inode->i_cdev) + cpu =3D (long)inode->i_cdev - 1; + + guard(mutex)(&remote->lock); + + trace_remote_reset(remote, cpu); + + return cnt; +} + +static const struct file_operations trace_fops =3D { + .write =3D trace_write, +}; + static int trace_remote_init_tracefs(const char *name, struct trace_remote= *remote) { struct dentry *remote_d, *percpu_d, *d; @@ -452,6 +488,10 @@ static int trace_remote_init_tracefs(const char *name,= struct trace_remote *remo if (!d) goto err; =20 + d =3D trace_create_file("trace", TRACEFS_MODE_WRITE, remote_d, remote, &t= race_fops); + if (!d) + goto err; + percpu_d =3D tracefs_create_dir("per_cpu", remote_d); if (!percpu_d) { pr_err("Failed to create tracefs dir "TRACEFS_DIR"%s/per_cpu/\n", name); @@ -474,6 +514,11 @@ static int trace_remote_init_tracefs(const char *name,= struct trace_remote *remo &trace_pipe_fops); if (!d) goto err; + + d =3D trace_create_cpu_file("trace", TRACEFS_MODE_WRITE, cpu_d, remote, = cpu, + &trace_fops); + if (!d) + goto err; } =20 return 0; --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 803463542EF for ; Sat, 31 Jan 2026 13:29:29 +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=1769866172; cv=none; b=dnHR5QUsjpUw1uN4F2fbFujIJlXB/M1kcuMvpff5lrFGYQBaLgPSvZ4Qs4/bc+KXmGBLbeQw6sZOgGvn4QptD3EFtwe0us+DW+tPn7e0EgYbfold2wvCsPakE66ooGtF/jPLLoclW7dSGMzcdRpqqJ33b2pAxqvX4NJ1RkNzd28= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866172; c=relaxed/simple; bh=m/U8pyNNaKUbeR2ZptM8Nlu4Kn/daQA9ukX0NpNIfYA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=rmNqSCRJ0iAMmmjBO2GeI1BVR2zNhkQRev0a4D72di63/Wfjamg2/XecAhq/qtIaTVrSjKy0KN9gN2MWc3zAOjTmPOcKt/DVFzkKTshJWZkY5vpoDd7OXFhXTVCONnSXgX+2Ooi5p7yTPLFc5sz50QHqNu2I6zU7irA4Zm4Ngew= 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=2nPEDpf0; 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="2nPEDpf0" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-47d4029340aso52911005e9.3 for ; Sat, 31 Jan 2026 05:29:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866168; x=1770470968; 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=fX14JGUgRa1ZiPwayZwX9u3eOOgxFO2kmdHSzA2Nkpk=; b=2nPEDpf0f3S1r+qM1I2pGjM+GsBVRlsI/nTpTW6bZzNLEm7C+rTl+xr9DmKgujLogT sbAwOWydsCY7Aat26zIa1GKch+ohk5T0BDRq0IwvSK35adPpwkMQUTpytAXPpkQ+SlJm 3pz5/yr5WPHY+0a6xVHv9IegmtS7TjJwzEmm2I3ReV+SfI9i/8irVvkBMyvwIbG1fofy QIgZsjXGrdKJyWRON+Ux2BFfR7kZwHDSkzpvbbNn4wrv7h3JeJEqWv//RcmjtHGTXWso 2adu4uHPwRc2JjnCWIdrit7pqscx4LW2JaCZfpueOFxpovAK9ULSlRgYVESuQU7KAiAE 2DYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866168; x=1770470968; 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=fX14JGUgRa1ZiPwayZwX9u3eOOgxFO2kmdHSzA2Nkpk=; b=MpRJQhfPXw/6fv1l1Kuic6MG+8KquaW3SXWViI5ye9L1I/uV+Zn+4JRajJM8II/jK7 3dY4xvi+W6OUHuAbRFXDzQkyuZgc6Ytb4pfHJ9fMRKuHKukV12Jq0Mv3KRH1TLQf45Jx DGCPlXux57uEmupdwLmbdD9bh1YV9uuHahwRuRYg9SqStCBHQYj9J9K8kexm1Z79vuCB mQm0LONbZgVTgR/qaxIairnhgGgfqP2YnK36V+Oh7b/l95Z2jW6zNmIfYfkhtzkiZkx+ +mf+Il18V/kgOtcN5xN7U9o4HU1JurxjporFOG3HLAL5eBlicRbmhxmNzMPatEqzs5FX 4rmQ== X-Forwarded-Encrypted: i=1; AJvYcCXe/I4bWFhNOfK+9UDBphaS/+B6A4H3KH5DYRyAlIVjaXl+lyRHZWUORMiEEXAzwm+jViGKFhDSHpCrdz8=@vger.kernel.org X-Gm-Message-State: AOJu0YwmvNSPN1aa153p5gJg0eE/8osH4T8LvRWwvgpt466gFO9LoJXW i7TIHtVzpHNq6elHJDfW089FqzUrTjPTcER24L4RZcu4Fc/1DpXrcyMiS02EFXm+lHP3Vx4qsP+ vXDeK/i0Mee6JQ1k2emZJsA== X-Received: from wmxa5-n2.prod.google.com ([2002:a05:600d:6445:20b0:480:6b05:6b8e]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4ec7:b0:477:8b77:155e with SMTP id 5b1f17b1804b1-482db46b04fmr73736805e9.15.1769866167812; Sat, 31 Jan 2026 05:29:27 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:25 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-8-vdonnefort@google.com> Subject: [PATCH v11 07/30] tracing: Add non-consuming read to 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, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Allow reading the trace file for trace remotes. This performs a non-consuming read of the trace buffer. Signed-off-by: Vincent Donnefort diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 1fcbdea992d2..d6eee96a6789 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -4605,7 +4605,7 @@ static int s_show(struct seq_file *m, void *v) * Should be used after trace_array_get(), trace_types_lock * ensures that i_cdev was already initialized. */ -static inline int tracing_get_cpu(struct inode *inode) +int tracing_get_cpu(struct inode *inode) { if (inode->i_cdev) /* See trace_create_cpu_file() */ return (long)inode->i_cdev - 1; diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index fdbcd068ba38..aa397acb6be9 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -686,6 +686,7 @@ struct dentry *trace_create_cpu_file(const char *name, void *data, long cpu, const struct file_operations *fops); +int tracing_get_cpu(struct inode *inode); =20 =20 /** diff --git a/kernel/trace/trace_remote.c b/kernel/trace/trace_remote.c index 82060bb19ba1..e03fde73aac7 100644 --- a/kernel/trace/trace_remote.c +++ b/kernel/trace/trace_remote.c @@ -18,14 +18,23 @@ #define TRACEFS_MODE_WRITE 0640 #define TRACEFS_MODE_READ 0440 =20 +enum tri_type { + TRI_CONSUMING, + TRI_NONCONSUMING, +}; + struct trace_remote_iterator { struct trace_remote *remote; struct trace_seq seq; struct delayed_work poll_work; unsigned long lost_events; u64 ts; + struct ring_buffer_iter *rb_iter; + struct ring_buffer_iter **rb_iters; int cpu; int evt_cpu; + loff_t pos; + enum tri_type type; }; =20 struct trace_remote { @@ -36,6 +45,8 @@ struct trace_remote { unsigned long trace_buffer_size; struct ring_buffer_remote rb_remote; struct mutex lock; + struct rw_semaphore reader_lock; + struct rw_semaphore *pcpu_reader_locks; unsigned int nr_readers; unsigned int poll_ms; bool tracing_on; @@ -230,6 +241,20 @@ static int trace_remote_get(struct trace_remote *remot= e, int cpu) if (ret) return ret; =20 + if (cpu !=3D RING_BUFFER_ALL_CPUS && !remote->pcpu_reader_locks) { + int lock_cpu; + + remote->pcpu_reader_locks =3D kcalloc(nr_cpu_ids, sizeof(*remote->pcpu_r= eader_locks), + GFP_KERNEL); + if (!remote->pcpu_reader_locks) { + trace_remote_try_unload(remote); + return -ENOMEM; + } + + for_each_possible_cpu(lock_cpu) + init_rwsem(&remote->pcpu_reader_locks[lock_cpu]); + } + remote->nr_readers++; =20 return 0; @@ -244,6 +269,9 @@ static void trace_remote_put(struct trace_remote *remot= e) if (remote->nr_readers) return; =20 + kfree(remote->pcpu_reader_locks); + remote->pcpu_reader_locks =3D NULL; + trace_remote_try_unload(remote); } =20 @@ -258,13 +286,58 @@ static void __poll_remote(struct work_struct *work) msecs_to_jiffies(iter->remote->poll_ms)); } =20 -static struct trace_remote_iterator *trace_remote_iter(struct trace_remote= *remote, int cpu) +static void __free_ring_buffer_iter(struct trace_remote_iterator *iter, in= t cpu) +{ + if (!iter->rb_iter) + return; + + if (cpu !=3D RING_BUFFER_ALL_CPUS) { + ring_buffer_read_finish(iter->rb_iter); + return; + } + + for_each_possible_cpu(cpu) { + if (iter->rb_iters[cpu]) + ring_buffer_read_finish(iter->rb_iters[cpu]); + } + + kfree(iter->rb_iters); +} + +static int __alloc_ring_buffer_iter(struct trace_remote_iterator *iter, in= t cpu) +{ + if (cpu !=3D RING_BUFFER_ALL_CPUS) { + iter->rb_iter =3D ring_buffer_read_start(iter->remote->trace_buffer, cpu= , GFP_KERNEL); + + return iter->rb_iter ? 0 : -ENOMEM; + } + + iter->rb_iters =3D kcalloc(nr_cpu_ids, sizeof(*iter->rb_iters), GFP_KERNE= L); + if (!iter->rb_iters) + return -ENOMEM; + + for_each_possible_cpu(cpu) { + iter->rb_iters[cpu] =3D ring_buffer_read_start(iter->remote->trace_buffe= r, cpu, + GFP_KERNEL); + if (!iter->rb_iters[cpu]) { + __free_ring_buffer_iter(iter, RING_BUFFER_ALL_CPUS); + return -ENOMEM; + } + } + + return 0; +} + +static struct trace_remote_iterator +*trace_remote_iter(struct trace_remote *remote, int cpu, enum tri_type typ= e) { struct trace_remote_iterator *iter =3D NULL; int ret; =20 lockdep_assert_held(&remote->lock); =20 + if (type =3D=3D TRI_NONCONSUMING && !trace_remote_loaded(remote)) + return NULL; =20 ret =3D trace_remote_get(remote, cpu); if (ret) @@ -279,9 +352,21 @@ static struct trace_remote_iterator *trace_remote_iter= (struct trace_remote *remo if (iter) { iter->remote =3D remote; iter->cpu =3D cpu; + iter->type =3D type; trace_seq_init(&iter->seq); - INIT_DELAYED_WORK(&iter->poll_work, __poll_remote); - schedule_delayed_work(&iter->poll_work, msecs_to_jiffies(remote->poll_ms= )); + + switch (type) { + case TRI_CONSUMING: + INIT_DELAYED_WORK(&iter->poll_work, __poll_remote); + schedule_delayed_work(&iter->poll_work, msecs_to_jiffies(remote->poll_m= s)); + break; + case TRI_NONCONSUMING: + ret =3D __alloc_ring_buffer_iter(iter, cpu); + break; + } + + if (ret) + goto err; =20 return iter; } @@ -305,10 +390,100 @@ static void trace_remote_iter_free(struct trace_remo= te_iterator *iter) =20 lockdep_assert_held(&remote->lock); =20 + switch (iter->type) { + case TRI_CONSUMING: + cancel_delayed_work_sync(&iter->poll_work); + break; + case TRI_NONCONSUMING: + __free_ring_buffer_iter(iter, iter->cpu); + break; + } + kfree(iter); trace_remote_put(remote); } =20 +static void trace_remote_iter_read_start(struct trace_remote_iterator *ite= r) +{ + struct trace_remote *remote =3D iter->remote; + int cpu =3D iter->cpu; + + /* Acquire global reader lock */ + if (cpu =3D=3D RING_BUFFER_ALL_CPUS && iter->type =3D=3D TRI_CONSUMING) + down_write(&remote->reader_lock); + else + down_read(&remote->reader_lock); + + if (cpu =3D=3D RING_BUFFER_ALL_CPUS) + return; + + /* + * No need for the remote lock here, iter holds a reference on + * remote->nr_readers + */ + + /* Get the per-CPU one */ + if (WARN_ON_ONCE(!remote->pcpu_reader_locks)) + return; + + if (iter->type =3D=3D TRI_CONSUMING) + down_write(&remote->pcpu_reader_locks[cpu]); + else + down_read(&remote->pcpu_reader_locks[cpu]); +} + +static void trace_remote_iter_read_finished(struct trace_remote_iterator *= iter) +{ + struct trace_remote *remote =3D iter->remote; + int cpu =3D iter->cpu; + + /* Release per-CPU reader lock */ + if (cpu !=3D RING_BUFFER_ALL_CPUS) { + /* + * No need for the remote lock here, iter holds a reference on + * remote->nr_readers + */ + if (iter->type =3D=3D TRI_CONSUMING) + up_write(&remote->pcpu_reader_locks[cpu]); + else + up_read(&remote->pcpu_reader_locks[cpu]); + } + + /* Release global reader lock */ + if (cpu =3D=3D RING_BUFFER_ALL_CPUS && iter->type =3D=3D TRI_CONSUMING) + up_write(&remote->reader_lock); + else + up_read(&remote->reader_lock); +} + +static struct ring_buffer_iter *__get_rb_iter(struct trace_remote_iterator= *iter, int cpu) +{ + return iter->cpu !=3D RING_BUFFER_ALL_CPUS ? iter->rb_iter : iter->rb_ite= rs[cpu]; +} + +static struct ring_buffer_event * +__peek_event(struct trace_remote_iterator *iter, int cpu, u64 *ts, unsigne= d long *lost_events) +{ + struct ring_buffer_event *rb_evt; + struct ring_buffer_iter *rb_iter; + + switch (iter->type) { + case TRI_CONSUMING: + return ring_buffer_peek(iter->remote->trace_buffer, cpu, ts, lost_events= ); + case TRI_NONCONSUMING: + rb_iter =3D __get_rb_iter(iter, cpu); + rb_evt =3D ring_buffer_iter_peek(rb_iter, ts); + if (!rb_evt) + return NULL; + + *lost_events =3D ring_buffer_iter_dropped(rb_iter); + + return rb_evt; + } + + return NULL; +} + static bool trace_remote_iter_read_event(struct trace_remote_iterator *ite= r) { struct trace_buffer *trace_buffer =3D iter->remote->trace_buffer; @@ -318,7 +493,7 @@ static bool trace_remote_iter_read_event(struct trace_r= emote_iterator *iter) if (ring_buffer_empty_cpu(trace_buffer, cpu)) return false; =20 - if (!ring_buffer_peek(trace_buffer, cpu, &iter->ts, &iter->lost_events)) + if (!__peek_event(iter, cpu, &iter->ts, &iter->lost_events)) return false; =20 iter->evt_cpu =3D cpu; @@ -333,7 +508,7 @@ static bool trace_remote_iter_read_event(struct trace_r= emote_iterator *iter) if (ring_buffer_empty_cpu(trace_buffer, cpu)) continue; =20 - if (!ring_buffer_peek(trace_buffer, cpu, &ts, &lost_events)) + if (!__peek_event(iter, cpu, &ts, &lost_events)) continue; =20 if (ts >=3D iter->ts) @@ -347,6 +522,20 @@ static bool trace_remote_iter_read_event(struct trace_= remote_iterator *iter) return iter->ts !=3D U64_MAX; } =20 +static void trace_remote_iter_move(struct trace_remote_iterator *iter) +{ + struct trace_buffer *trace_buffer =3D iter->remote->trace_buffer; + + switch (iter->type) { + case TRI_CONSUMING: + ring_buffer_consume(trace_buffer, iter->evt_cpu, NULL, NULL); + break; + case TRI_NONCONSUMING: + ring_buffer_iter_advance(__get_rb_iter(iter, iter->evt_cpu)); + break; + } +} + static int trace_remote_iter_print_event(struct trace_remote_iterator *ite= r) { unsigned long usecs_rem; @@ -369,13 +558,14 @@ static int trace_pipe_open(struct inode *inode, struc= t file *filp) { struct trace_remote *remote =3D inode->i_private; struct trace_remote_iterator *iter; - int cpu =3D RING_BUFFER_ALL_CPUS; - - if (inode->i_cdev) - cpu =3D (long)inode->i_cdev - 1; + int cpu =3D tracing_get_cpu(inode); =20 guard(mutex)(&remote->lock); - iter =3D trace_remote_iter(remote, cpu); + + iter =3D trace_remote_iter(remote, cpu, TRI_CONSUMING); + if (IS_ERR(iter)) + return PTR_ERR(iter); + filp->private_data =3D iter; =20 return IS_ERR(iter) ? PTR_ERR(iter) : 0; @@ -410,6 +600,8 @@ static ssize_t trace_pipe_read(struct file *filp, char = __user *ubuf, size_t cnt, if (ret < 0) return ret; =20 + trace_remote_iter_read_start(iter); + while (trace_remote_iter_read_event(iter)) { int prev_len =3D iter->seq.seq.len; =20 @@ -418,9 +610,11 @@ static ssize_t trace_pipe_read(struct file *filp, char= __user *ubuf, size_t cnt, break; } =20 - ring_buffer_consume(trace_buffer, iter->evt_cpu, NULL, NULL); + trace_remote_iter_move(iter); } =20 + trace_remote_iter_read_finished(iter); + goto copy_to_user; } =20 @@ -430,14 +624,123 @@ static const struct file_operations trace_pipe_fops = =3D { .release =3D trace_pipe_release, }; =20 +static void *trace_next(struct seq_file *m, void *v, loff_t *pos) +{ + struct trace_remote_iterator *iter =3D m->private; + + ++*pos; + + if (!iter || !trace_remote_iter_read_event(iter)) + return NULL; + + trace_remote_iter_move(iter); + iter->pos++; + + return iter; +} + +static void *trace_start(struct seq_file *m, loff_t *pos) +{ + struct trace_remote_iterator *iter =3D m->private; + loff_t i; + + if (!iter) + return NULL; + + if (!*pos) { + iter->pos =3D -1; + return trace_next(m, NULL, &i); + } + + i =3D iter->pos; + while (i < *pos) { + iter =3D trace_next(m, NULL, &i); + if (!iter) + return NULL; + } + + return iter; +} + +static int trace_show(struct seq_file *m, void *v) +{ + struct trace_remote_iterator *iter =3D v; + + trace_seq_init(&iter->seq); + + if (trace_remote_iter_print_event(iter)) { + seq_printf(m, "[EVENT %d PRINT TOO BIG]\n", iter->evt->id); + return 0; + } + + return trace_print_seq(m, &iter->seq); +} + +static void trace_stop(struct seq_file *s, void *v) { } + +static const struct seq_operations trace_sops =3D { + .start =3D trace_start, + .next =3D trace_next, + .show =3D trace_show, + .stop =3D trace_stop, +}; + +static int trace_open(struct inode *inode, struct file *filp) +{ + struct trace_remote *remote =3D inode->i_private; + struct trace_remote_iterator *iter =3D NULL; + int cpu =3D tracing_get_cpu(inode); + int ret; + + if (!(filp->f_mode & FMODE_READ)) + return 0; + + guard(mutex)(&remote->lock); + + iter =3D trace_remote_iter(remote, cpu, TRI_NONCONSUMING); + if (IS_ERR(iter)) + return PTR_ERR(iter); + + ret =3D seq_open(filp, &trace_sops); + if (ret) { + trace_remote_iter_free(iter); + return ret; + } + + if (iter) + trace_remote_iter_read_start(iter); + + ((struct seq_file *)filp->private_data)->private =3D (void *)iter; + + return 0; +} + +static int trace_release(struct inode *inode, struct file *filp) +{ + struct trace_remote_iterator *iter; + + if (!(filp->f_mode & FMODE_READ)) + return 0; + + iter =3D ((struct seq_file *)filp->private_data)->private; + seq_release(inode, filp); + + if (!iter) + return 0; + + guard(mutex)(&iter->remote->lock); + + trace_remote_iter_read_finished(iter); + trace_remote_iter_free(iter); + + return 0; +} + static ssize_t trace_write(struct file *filp, const char __user *ubuf, siz= e_t cnt, loff_t *ppos) { struct inode *inode =3D file_inode(filp); struct trace_remote *remote =3D inode->i_private; - int cpu =3D RING_BUFFER_ALL_CPUS; - - if (inode->i_cdev) - cpu =3D (long)inode->i_cdev - 1; + int cpu =3D tracing_get_cpu(inode); =20 guard(mutex)(&remote->lock); =20 @@ -447,7 +750,11 @@ static ssize_t trace_write(struct file *filp, const ch= ar __user *ubuf, size_t cn } =20 static const struct file_operations trace_fops =3D { + .open =3D trace_open, .write =3D trace_write, + .read =3D seq_read, + .read_iter =3D seq_read_iter, + .release =3D trace_release, }; =20 static int trace_remote_init_tracefs(const char *name, struct trace_remote= *remote) @@ -566,6 +873,7 @@ int trace_remote_register(const char *name, struct trac= e_remote_callbacks *cbs, remote->trace_buffer_size =3D 7 << 10; remote->poll_ms =3D 100; mutex_init(&remote->lock); + init_rwsem(&remote->reader_lock); =20 if (trace_remote_init_tracefs(name, remote)) { kfree(remote); --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 2026 Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.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 7F566354AC7 for ; Sat, 31 Jan 2026 13:29:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866173; cv=none; b=CLrE8d+Hw6gMZkpi7IpGKcfTc9TCjBOgGFDmTkO8Si6AxV6OhV2PpOE42l4aLEti0Y55uyth1QB72RXCeXEhrMtIGCAhD/NAmm4+temkcKckoBfSbk2Oed8l3Q6t2qMmDECGoJAlOCJBQdh+cHG7E8oAPAibWMzi7R+wFYpEgjk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866173; c=relaxed/simple; bh=wMqFpMWKBFJX4WNiZXUaDZF9TfQWdfJVHz79lqJGwb0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=DbASxoseUOSI3D55gXwfG77s37C/+8xw4ScGp8NXoAotcCfT2I5amBLBeyWxj0xdpWQk4TPihR3oiKXYkSBjrZuPpPsieDLYwZU+ELuRE2QaPCm7AS9MUkNY+DFTHI9IiVxogm2B9NUwdd8MKF5tNtd0DL6Z0cCPLO7g8x2jJjA= 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=f62OxHfW; arc=none smtp.client-ip=209.85.208.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="f62OxHfW" Received: by mail-ed1-f73.google.com with SMTP id 4fb4d7f45d1cf-658e629003cso2253435a12.0 for ; Sat, 31 Jan 2026 05:29:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866169; x=1770470969; 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=7EnUsHuSY31rm33Evz3AO9vawTajgwNWCLhwQDTSMr4=; b=f62OxHfWW/6jlk0I6bBMIDfPgkcfd1yA33hX5K+cbX8Yjs56EGJCV9JBxU2joHPdBQ ERrQsfjj1ovEW7pfHUr89CSPPmksW/zUEEQIkPrV5iQTwpUTBxAtd+llBgB+21kPA/7W NBX4l9dObaGLVmYR+p2Dp/VpTAzQWb2HsF7fs/2OeS3YCmXRWAJUNiXkuMnw/wMjTfjS AzpzdvQwA+ZM5oe8PYvn6YulJ9UV7YjRRUz9DjfrnNiQNzhy3KJngvg7syUGTP66/gyG wjm+sgNBKcfzejjyuuxjhqRIDFF+btXjwglAegAEtEnDbQ8eKx2b2fXoDJr1QwTFQk/J FOSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866169; x=1770470969; 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=7EnUsHuSY31rm33Evz3AO9vawTajgwNWCLhwQDTSMr4=; b=QybCjn7Zl9c0pCj5203RXY80960pT3pX+D2AGr2RRNFne3iUmuunfVZuk4qUqc5cB5 YQq7sVU/bMJQdvGwtq+N4qnqrn42m6Ruf/h9juPaNi9YpLgxSyIAt2lUDf9iBbbQaXc8 sKq3gQN/GDRCfdHPK0NeCn30HF/lnpKXrVvoL2z6HXaeARPHrZL6i4/2Ju83PTILGIz0 4PpeZk4ehnK10WGKi/laRLAvfpxptqGPU+kLVjNRkXQW1ZjmiMghFTI4qR3tRybk4uX7 uZaGRqF5cLV3L8uTLMpnVf9kJRh5S0g+vlhMxWvWM7smmltg+Pg9NvevNd9PwZQByQ1j Nu6g== X-Forwarded-Encrypted: i=1; AJvYcCXjrAr7hHUQMZ6ficpOfewvSNO0tb/p5sjgcgnB/t28JmG6K5EYnG+oiJQno6OTZdt2hqqu6bltxTZUMk8=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9Y0hH1cSgfK8xB8iuMtxu2UrEe51YA9Qj6smKU7HwI+vOstEM hc29AtbqjgadgaiLiFfibdTuMfyQN7jqibJBhz+pb6gDtEmxa1olayzndFBECxuKQxGDfIFWxGw +GOie/u/PdeG9Drp0YODfIw== X-Received: from edxz19.prod.google.com ([2002:aa7:cf93:0:b0:647:6be6:f4ec]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:3587:b0:658:d405:9797 with SMTP id 4fb4d7f45d1cf-658de58b4f5mr3837419a12.16.1769866168670; Sat, 31 Jan 2026 05:29:28 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:26 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-9-vdonnefort@google.com> Subject: [PATCH v11 08/30] tracing: Add init callback to 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, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a .init call back so the trace remote callers can add entries to the tracefs directory. Reviewed-by: Steven Rostedt (Google) Signed-off-by: Vincent Donnefort diff --git a/include/linux/trace_remote.h b/include/linux/trace_remote.h index 7fb5271a8c30..c4df3d98e5dc 100644 --- a/include/linux/trace_remote.h +++ b/include/linux/trace_remote.h @@ -3,11 +3,14 @@ #ifndef _LINUX_TRACE_REMOTE_H #define _LINUX_TRACE_REMOTE_H =20 +#include #include =20 /** * struct trace_remote_callbacks - Callbacks used by Tracefs to control th= e remote * + * @init: Called once the remote has been registered. Allows the + * caller to extend the Tracefs remote directory * @load_trace_buffer: Called before Tracefs accesses the trace buffer fo= r the first * time. Must return a &trace_buffer_desc * (most likely filled with trace_remote_alloc_buffer()) @@ -23,6 +26,7 @@ * new reader-page from the @cpu ring-buffer. */ struct trace_remote_callbacks { + int (*init)(struct dentry *d, void *priv); struct trace_buffer_desc *(*load_trace_buffer)(unsigned long size, void *= priv); void (*unload_trace_buffer)(struct trace_buffer_desc *desc, void *priv); int (*enable_tracing)(bool enable, void *priv); diff --git a/kernel/trace/trace_remote.c b/kernel/trace/trace_remote.c index e03fde73aac7..8a7662ff775f 100644 --- a/kernel/trace/trace_remote.c +++ b/kernel/trace/trace_remote.c @@ -863,6 +863,7 @@ static int trace_remote_init_tracefs(const char *name, = struct trace_remote *remo int trace_remote_register(const char *name, struct trace_remote_callbacks = *cbs, void *priv) { struct trace_remote *remote; + int ret; =20 remote =3D kzalloc(sizeof(*remote), GFP_KERNEL); if (!remote) @@ -880,7 +881,11 @@ int trace_remote_register(const char *name, struct tra= ce_remote_callbacks *cbs, return -ENOMEM; } =20 - return 0; + ret =3D cbs->init ? cbs->init(remote->dentry, priv) : 0; + if (ret) + pr_err("Init failed for trace remote '%s' (%d)\n", name, ret); + + return ret; } EXPORT_SYMBOL_GPL(trace_remote_register); =20 --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 9617135503C for ; Sat, 31 Jan 2026 13:29:31 +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=1769866174; cv=none; b=a1L9fy5VuDtbsqAZQC3nSLXnfZgImoiFcNOY8L03OLO4JOyFnJDj0qDUfhMG5LzMM2dgJ/SaRAKbDR2FDxlrnb+pKGSFz0DuQC8LZ+IddZwa8Qko/1QugH/Hh9KvilQd7VB3ZIhkbFkln17BJQHQ88w6JXjjzHSiWydb9O9c3CA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866174; c=relaxed/simple; bh=hKs0PefPo7ID8yG5DVjADS4fNS6LMrtPra6RF47svwg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=VtJesYnAtQ3TlbcX00n8KIYaGPn3R1I8++R9O7i4hwKROXBHT0uEvsQY1oVKRYsgdFu+NmRgn7wRpC9y1ZejgjsC9FpgxrJX4FbOPnrOQPPKNfclN4YYz4ioNft8avdJ+kA2+QEViswjDGDBYLsisrGjMfxUS/iSJF3U9oh5bjY= 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=bRoAzg1i; 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="bRoAzg1i" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4806e7c4220so24408705e9.2 for ; Sat, 31 Jan 2026 05:29:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866169; x=1770470969; 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=hcbblNYChlvJOk9G0TY3Dwa4/PsbPIHEanYZodZYk90=; b=bRoAzg1iwdYL/sJZg0MF7f129VGNR6cN9T6g400LjUVsFK2zPDkT6aAVIqMtDAPMzY nMdR56/cZ/hKq8/iOQYnZmtmRCFfZkv9MC4v/qLYTCwqBhr11fOaokTGXijHvtmMCnpL M0/9SfwlXz4M4BIRpOOLojwRFpAc+6Fw2jammBE2/daRKh+sTEwyZ76mwwaM7xEk7BI7 b2zVjJkb1td3kCD/nFIgxWb94RsEYFOQM8x38UzUQBujVcNzPdE/MTkf4j9qWMOiB/uV T+0xai+R167OS8AyUGVgOIZr4SQJfpDJeoR9GgEnoV4r8Ox6BCV9JB6uHfnh49dPEYTq OCfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866169; x=1770470969; 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=hcbblNYChlvJOk9G0TY3Dwa4/PsbPIHEanYZodZYk90=; b=Wi9ZjkNmwdoFlAP6JncrPEBKo7JVhoa/fOiUCIqQBotfbtlJrbTN4LRZg/RjfJ3s5v 59kFlWswx4wjOjzgnYDEf0/eu2qt5Drp5Bnp7N1tTTpfEh9EWrrYkeyG+mMhtJvzex6O xnYpgBUjb4Odv9Gof074z3zzj3tUAXgxQxg5dzizmLKerDVHn5b/lo4DCL6oqMz57MTH 6lOIYCZd+CzunGKi7cBnqGUES6Nhp+tDx8qZ5KGjjdnornx7Hs0NZydIyrjIKC+rhdvf 1hQZyqzZlLxjfSlCrU4spCth70unnMAbIGvhD7wKnE8SQNC4VvrewEImjhy92wMKmXTn ZYHA== X-Forwarded-Encrypted: i=1; AJvYcCUC8oAXjtxFDzXqAu/Mp1Tu6FfwffAufLrA7CyPI4JVje95XtFSmmBKHuvmJ7a6B5TONKaNkG0inCuKpKE=@vger.kernel.org X-Gm-Message-State: AOJu0Yz255l/ezRp6ZMGcLiIhsyedgUmSwMmzNgA4gjragnh0tpTkxqc /LkiXFqLg5aTSOHu4zTZFOGzzwmcZ/kmrv+Vt19RJnKgtlp/JSrvVOprXiMOmY6xO4h/ao3LR3q aqHV3Q+WVas4jvYKOm+6nfg== X-Received: from wmbei10.prod.google.com ([2002:a05:600c:3f0a:b0:47b:e2d9:2e56]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1e8a:b0:47e:e7e5:ff32 with SMTP id 5b1f17b1804b1-482db4a7a82mr69142455e9.34.1769866169524; Sat, 31 Jan 2026 05:29:29 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:27 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-10-vdonnefort@google.com> Subject: [PATCH v11 09/30] tracing: Add events to 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, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" An event is predefined point in the writer code that allows to log data. Following the same scheme as kernel events, add remote events, described to user-space within the events/ tracefs directory found in the corresponding trace remote. Remote events are expected to be described during the trace remote registration. Add also a .enable_event callback for trace_remote to toggle the event logging, if supported. Signed-off-by: Vincent Donnefort diff --git a/include/linux/trace_remote.h b/include/linux/trace_remote.h index c4df3d98e5dc..b34c2997ae79 100644 --- a/include/linux/trace_remote.h +++ b/include/linux/trace_remote.h @@ -5,6 +5,7 @@ =20 #include #include +#include =20 /** * struct trace_remote_callbacks - Callbacks used by Tracefs to control th= e remote @@ -24,6 +25,8 @@ * @reset: Called on `echo 0 > trace`. It is expected from the * remote to reset all ring-buffer pages. * new reader-page from the @cpu ring-buffer. + * @enable_event: Called on events/event_name/enable. It is expected from + * the remote to allow the writing event @id. */ struct trace_remote_callbacks { int (*init)(struct dentry *d, void *priv); @@ -32,9 +35,11 @@ struct trace_remote_callbacks { int (*enable_tracing)(bool enable, void *priv); int (*swap_reader_page)(unsigned int cpu, void *priv); int (*reset)(unsigned int cpu, void *priv); + int (*enable_event)(unsigned short id, bool enable, void *priv); }; =20 -int trace_remote_register(const char *name, struct trace_remote_callbacks = *cbs, void *priv); +int trace_remote_register(const char *name, struct trace_remote_callbacks = *cbs, void *priv, + struct remote_event *events, size_t nr_events); =20 int trace_remote_alloc_buffer(struct trace_buffer_desc *desc, size_t desc_= size, size_t buffer_size, const struct cpumask *cpumask); diff --git a/include/linux/trace_remote_event.h b/include/linux/trace_remot= e_event.h new file mode 100644 index 000000000000..a4449008a075 --- /dev/null +++ b/include/linux/trace_remote_event.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _LINUX_TRACE_REMOTE_EVENTS_H +#define _LINUX_TRACE_REMOTE_EVENTS_H + +struct trace_remote; +struct trace_event_fields; + +struct remote_event_hdr { + unsigned short id; +}; + +#define REMOTE_EVENT_NAME_MAX 30 +struct remote_event { + char name[REMOTE_EVENT_NAME_MAX]; + unsigned short id; + bool enabled; + struct trace_remote *remote; + struct trace_event_fields *fields; + char *print_fmt; + void (*print)(void *evt, struct trace_seq *seq); +}; +#endif diff --git a/kernel/trace/trace_remote.c b/kernel/trace/trace_remote.c index 8a7662ff775f..b8bb43b3acd2 100644 --- a/kernel/trace/trace_remote.c +++ b/kernel/trace/trace_remote.c @@ -31,6 +31,7 @@ struct trace_remote_iterator { u64 ts; struct ring_buffer_iter *rb_iter; struct ring_buffer_iter **rb_iters; + struct remote_event_hdr *evt; int cpu; int evt_cpu; loff_t pos; @@ -42,6 +43,10 @@ struct trace_remote { void *priv; struct trace_buffer *trace_buffer; struct trace_buffer_desc *trace_buffer_desc; + struct dentry *dentry; + struct eventfs_inode *eventfs; + struct remote_event *events; + unsigned long nr_events; unsigned long trace_buffer_size; struct ring_buffer_remote rb_remote; struct mutex lock; @@ -168,7 +173,8 @@ static void trace_remote_reset(struct trace_remote *rem= ote, int cpu) static ssize_t tracing_on_write(struct file *filp, const char __user *ubuf, size_t cnt, l= off_t *ppos) { - struct trace_remote *remote =3D filp->private_data; + struct seq_file *seq =3D filp->private_data; + struct trace_remote *remote =3D seq->private; unsigned long val; int ret; =20 @@ -197,7 +203,8 @@ DEFINE_SHOW_STORE_ATTRIBUTE(tracing_on); static ssize_t buffer_size_kb_write(struct file *filp, const char __user *= ubuf, size_t cnt, loff_t *ppos) { - struct trace_remote *remote =3D filp->private_data; + struct seq_file *seq =3D filp->private_data; + struct trace_remote *remote =3D seq->private; unsigned long val; int ret; =20 @@ -487,16 +494,19 @@ __peek_event(struct trace_remote_iterator *iter, int = cpu, u64 *ts, unsigned long static bool trace_remote_iter_read_event(struct trace_remote_iterator *ite= r) { struct trace_buffer *trace_buffer =3D iter->remote->trace_buffer; + struct ring_buffer_event *rb_evt; int cpu =3D iter->cpu; =20 if (cpu !=3D RING_BUFFER_ALL_CPUS) { if (ring_buffer_empty_cpu(trace_buffer, cpu)) return false; =20 - if (!__peek_event(iter, cpu, &iter->ts, &iter->lost_events)) + rb_evt =3D __peek_event(iter, cpu, &iter->ts, &iter->lost_events); + if (!rb_evt) return false; =20 iter->evt_cpu =3D cpu; + iter->evt =3D (struct remote_event_hdr *)ring_buffer_event_data(rb_evt); return true; } =20 @@ -508,7 +518,8 @@ static bool trace_remote_iter_read_event(struct trace_r= emote_iterator *iter) if (ring_buffer_empty_cpu(trace_buffer, cpu)) continue; =20 - if (!__peek_event(iter, cpu, &ts, &lost_events)) + rb_evt =3D __peek_event(iter, cpu, &ts, &lost_events); + if (!rb_evt) continue; =20 if (ts >=3D iter->ts) @@ -516,6 +527,7 @@ static bool trace_remote_iter_read_event(struct trace_r= emote_iterator *iter) =20 iter->ts =3D ts; iter->evt_cpu =3D cpu; + iter->evt =3D (struct remote_event_hdr *)ring_buffer_event_data(rb_evt); iter->lost_events =3D lost_events; } =20 @@ -536,8 +548,11 @@ static void trace_remote_iter_move(struct trace_remote= _iterator *iter) } } =20 +static struct remote_event *trace_remote_find_event(struct trace_remote *r= emote, unsigned short id); + static int trace_remote_iter_print_event(struct trace_remote_iterator *ite= r) { + struct remote_event *evt; unsigned long usecs_rem; u64 ts =3D iter->ts; =20 @@ -551,6 +566,12 @@ static int trace_remote_iter_print_event(struct trace_= remote_iterator *iter) trace_seq_printf(&iter->seq, "[%03d]\t%5llu.%06lu: ", iter->evt_cpu, ts, usecs_rem); =20 + evt =3D trace_remote_find_event(iter->remote, iter->evt->id); + if (!evt) + trace_seq_printf(&iter->seq, "UNKNOWN id=3D%d\n", iter->evt->id); + else + evt->print(iter->evt, &iter->seq); + return trace_seq_has_overflowed(&iter->seq) ? -EOVERFLOW : 0; } =20 @@ -828,6 +849,8 @@ static int trace_remote_init_tracefs(const char *name, = struct trace_remote *remo goto err; } =20 + remote->dentry =3D remote_d; + return 0; =20 err: @@ -841,6 +864,9 @@ static int trace_remote_init_tracefs(const char *name, = struct trace_remote *remo return -ENOMEM; } =20 +static int trace_remote_register_events(const char *remote_name, struct tr= ace_remote *remote, + struct remote_event *events, size_t nr_events); + /** * trace_remote_register() - Register a Tracefs remote * @@ -860,7 +886,8 @@ static int trace_remote_init_tracefs(const char *name, = struct trace_remote *remo * * Return: 0 on success, negative error code on failure. */ -int trace_remote_register(const char *name, struct trace_remote_callbacks = *cbs, void *priv) +int trace_remote_register(const char *name, struct trace_remote_callbacks = *cbs, void *priv, + struct remote_event *events, size_t nr_events) { struct trace_remote *remote; int ret; @@ -881,6 +908,13 @@ int trace_remote_register(const char *name, struct tra= ce_remote_callbacks *cbs, return -ENOMEM; } =20 + ret =3D trace_remote_register_events(name, remote, events, nr_events); + if (ret) { + pr_err("Failed to register events for trace remote '%s' (%d)\n", + name, ret); + return ret; + } + ret =3D cbs->init ? cbs->init(remote->dentry, priv) : 0; if (ret) pr_err("Init failed for trace remote '%s' (%d)\n", name, ret); @@ -979,3 +1013,223 @@ int trace_remote_alloc_buffer(struct trace_buffer_de= sc *desc, size_t desc_size, return ret; } EXPORT_SYMBOL_GPL(trace_remote_alloc_buffer); + +static int +trace_remote_enable_event(struct trace_remote *remote, struct remote_event= *evt, bool enable) +{ + int ret; + + lockdep_assert_held(&remote->lock); + + if (evt->enabled =3D=3D enable) + return 0; + + ret =3D remote->cbs->enable_event(evt->id, enable, remote->priv); + if (ret) + return ret; + + evt->enabled =3D enable; + + return 0; +} + +static int remote_event_enable_show(struct seq_file *s, void *unused) +{ + struct remote_event *evt =3D s->private; + + seq_printf(s, "%d\n", evt->enabled); + + return 0; +} + +static ssize_t remote_event_enable_write(struct file *filp, const char __u= ser *ubuf, + size_t count, loff_t *ppos) +{ + struct seq_file *seq =3D filp->private_data; + struct remote_event *evt =3D seq->private; + struct trace_remote *remote =3D evt->remote; + u8 enable; + int ret; + + ret =3D kstrtou8_from_user(ubuf, count, 10, &enable); + if (ret) + return ret; + + guard(mutex)(&remote->lock); + + ret =3D trace_remote_enable_event(remote, evt, enable); + if (ret) + return ret; + + return count; +} +DEFINE_SHOW_STORE_ATTRIBUTE(remote_event_enable); + +static int remote_event_id_show(struct seq_file *s, void *unused) +{ + struct remote_event *evt =3D s->private; + + seq_printf(s, "%d\n", evt->id); + + return 0; +} +DEFINE_SHOW_ATTRIBUTE(remote_event_id); + +static int remote_event_format_show(struct seq_file *s, void *unused) +{ + size_t offset =3D sizeof(struct remote_event_hdr); + struct remote_event *evt =3D s->private; + struct trace_event_fields *field; + + seq_printf(s, "name: %s\n", evt->name); + seq_printf(s, "ID: %d\n", evt->id); + seq_puts(s, + "format:\n\tfield:unsigned short common_type;\toffset:0;\tsize:2;\tsign= ed:0;\n\n"); + + field =3D &evt->fields[0]; + while (field->name) { + seq_printf(s, "\tfield:%s %s;\toffset:%zu;\tsize:%u;\tsigned:%d;\n", + field->type, field->name, offset, field->size, + field->is_signed); + offset +=3D field->size; + field++; + } + + if (field !=3D &evt->fields[0]) + seq_puts(s, "\n"); + + seq_printf(s, "print fmt: %s\n", evt->print_fmt); + + return 0; +} +DEFINE_SHOW_ATTRIBUTE(remote_event_format); + +static int remote_event_callback(const char *name, umode_t *mode, void **d= ata, + const struct file_operations **fops) +{ + if (!strcmp(name, "enable")) { + *mode =3D TRACEFS_MODE_WRITE; + *fops =3D &remote_event_enable_fops; + return 1; + } + + if (!strcmp(name, "id")) { + *mode =3D TRACEFS_MODE_READ; + *fops =3D &remote_event_id_fops; + return 1; + } + + if (!strcmp(name, "format")) { + *mode =3D TRACEFS_MODE_READ; + *fops =3D &remote_event_format_fops; + return 1; + } + + return 0; +} + +static int trace_remote_init_eventfs(const char *remote_name, struct trace= _remote *remote, + struct remote_event *evt) +{ + struct eventfs_inode *eventfs =3D remote->eventfs; + static struct eventfs_entry entries[] =3D { + { + .name =3D "enable", + .callback =3D remote_event_callback, + }, { + .name =3D "id", + .callback =3D remote_event_callback, + }, { + .name =3D "format", + .callback =3D remote_event_callback, + } + }; + bool eventfs_create =3D false; + + if (!eventfs) { + eventfs =3D eventfs_create_events_dir("events", remote->dentry, NULL, 0,= NULL); + if (IS_ERR(eventfs)) + return PTR_ERR(eventfs); + + /* + * Create similar hierarchy as local events even if a single system is s= upported at + * the moment + */ + eventfs =3D eventfs_create_dir(remote_name, eventfs, NULL, 0, NULL); + if (IS_ERR(eventfs)) + return PTR_ERR(eventfs); + + remote->eventfs =3D eventfs; + eventfs_create =3D true; + } + + eventfs =3D eventfs_create_dir(evt->name, eventfs, entries, ARRAY_SIZE(en= tries), evt); + if (IS_ERR(eventfs)) { + if (eventfs_create) { + eventfs_remove_events_dir(remote->eventfs); + remote->eventfs =3D NULL; + } + return PTR_ERR(eventfs); + } + + return 0; +} + +static int trace_remote_attach_events(struct trace_remote *remote, struct = remote_event *events, + size_t nr_events) +{ + int i; + + for (i =3D 0; i < nr_events; i++) { + struct remote_event *evt =3D &events[i]; + + if (evt->remote) + return -EEXIST; + + evt->remote =3D remote; + + /* We need events to be sorted for efficient lookup */ + if (i && evt->id <=3D events[i - 1].id) + return -EINVAL; + } + + remote->events =3D events; + remote->nr_events =3D nr_events; + + return 0; +} + +static int trace_remote_register_events(const char *remote_name, struct tr= ace_remote *remote, + struct remote_event *events, size_t nr_events) +{ + int i, ret; + + ret =3D trace_remote_attach_events(remote, events, nr_events); + if (ret) + return ret; + + for (i =3D 0; i < nr_events; i++) { + struct remote_event *evt =3D &events[i]; + + ret =3D trace_remote_init_eventfs(remote_name, remote, evt); + if (ret) + pr_warn("Failed to init eventfs for event '%s' (%d)", + evt->name, ret); + } + + return 0; +} + +static int __cmp_events(const void *key, const void *data) +{ + const struct remote_event *evt =3D data; + int id =3D (int)((long)key); + + return id - (int)evt->id; +} + +static struct remote_event *trace_remote_find_event(struct trace_remote *r= emote, unsigned short id) +{ + return bsearch((const void *)(unsigned long)id, remote->events, remote->n= r_events, + sizeof(*remote->events), __cmp_events); +} --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 4D57F35505E for ; Sat, 31 Jan 2026 13:29:32 +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=1769866174; cv=none; b=HF+OqYDR9G7eqETd3hTG6IQuudBHSsA2ic+zy1fwnP8xLhP/gRdTAyrEg/hyw13xd0uCAOg/X9C2U+aEE2R6obEKTD4XPZUOfob/pM7LCwUIUk6NIR0jF/a7tzYRbUx1rHDloipir32FYGvDosXV8TxUHVPaGkC8oOITN+1en3M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866174; c=relaxed/simple; bh=eRffXUckXcnAARjC6Ts6AzruwJOgdF+tgT6EGLF7ldw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MyPmt+8JyRh3l/M1SBxOf0l/KM4SiS7d5DKMJUpDKbA/nNoDyH3mr4VxNi7IvmNDXsRnD4vJ9Loc+/XqUakVnpSyExITDmigjYFxhGhrn8ccpyvPCalFcl8kw0mhmYXD/oYSmTmPzgSKo3IA8N2/WKngr9j3Xbt4szCelbp1aqY= 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=An5gUhcZ; 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="An5gUhcZ" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-482eec44485so2165435e9.3 for ; Sat, 31 Jan 2026 05:29:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866171; x=1770470971; 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=hKtOhL3oFvJF/4kwFHqLo6w652pvqCPdYh+Oa+lYSBY=; b=An5gUhcZ1hyPch1kKoH+dZttR0D2y2Sh5F5+YAuAOShw7cvu0dpnFcp9Luzv2Ppv0a PtRyCxOGcvH5GdI+VJjZH6dsut841K5IjJqFa5pfecyCJTkrlPLZ8STKc0NZEHnslbXq HFGbCkyOHrp3VrkGlSn0sh4LBUM/6oofexJagxNpAn2CSPM+hBvjvkGmSaQxlVH+LuJI nE2v42JiwensVJA+zZO+nIEVXvEf0kNxtNDzk8F2M1t/Kj8dXTg+zflH0YFBPqaco9mf o3nKxOfIxQESAS9AkCImcUh7qnPjCKRi6rqeUNd8e8Q6NK5HI2aLoXq5vnaR13MsEjng NTpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866171; x=1770470971; 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=hKtOhL3oFvJF/4kwFHqLo6w652pvqCPdYh+Oa+lYSBY=; b=i1rGZLLoT+IJCiMp3jcO9CuKc0aY4gEqmiqRyjgQG0cO6Ig2N4jTc5IatdZ3XoQiyE LVTpG0tR27B5YICQf7B/HDMS6Ijz3lvBhV/jauQ3KvuytVa8q0kgwvESAJ4gPXzGHTbL rdUS0TZcUoLYZiBpfjJz6BWKgX/zXNSEK0XjVxD0STxwGyGmLTzQavWeS++tHOSHOjId GW0uJGZ5NAIOm36mh8VRuTWuJRXPweedn7BjsOGGcZNdGkFTnsCJreBi5g2doxsaIpJr BsjeGA+8HQYUXcIySm4fJLi1VUlbBRd7qq6g7mKrrmtRL8fddYSoRbUUHYkYxnZdy77q Jiqg== X-Forwarded-Encrypted: i=1; AJvYcCXoPzHUFy6npUIdQ0lVQTCducwh4qp3oJHMuUeBFmg8GO0O3ls9KQuh3j9TwP5QU+GeTWV8u2jNhdiT+5Q=@vger.kernel.org X-Gm-Message-State: AOJu0YwvlD0g2pNZqSBOwdQmF0n7heUUmMywjxWzLQG9ARhilPLXJ3RP AYhHmd3+XyGP3acwogZ3BHaQY8dOTNROkpZfnIEiBwI8/fxX4qyD/0/bAEBYjGDOJ0zWSJQS5no c1OORbnWDU7e1TE8VihSyKA== X-Received: from wmcn7.prod.google.com ([2002:a05:600c:c0c7:b0:47a:9289:c5d8]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4e8a:b0:477:73e9:dc17 with SMTP id 5b1f17b1804b1-482db4992famr80888375e9.35.1769866170752; Sat, 31 Jan 2026 05:29:30 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:28 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-11-vdonnefort@google.com> Subject: [PATCH v11 10/30] tracing: Add events/ root files to 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, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Just like for the kernel events directory, add 'enable', 'header_page' and 'header_event' at the root of the trace remote events/ directory. Reviewed-by: Steven Rostedt (Google) Signed-off-by: Vincent Donnefort diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 2d08dd326309..e28cc02d1a70 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -639,7 +639,8 @@ int ring_buffer_print_page_header(struct trace_buffer *= buffer, struct trace_seq trace_seq_printf(s, "\tfield: char data;\t" "offset:%u;\tsize:%u;\tsigned:%u;\n", (unsigned int)offsetof(typeof(field), data), - (unsigned int)buffer->subbuf_size, + (unsigned int)(buffer ? buffer->subbuf_size : + PAGE_SIZE - BUF_PAGE_HDR_SIZE), (unsigned int)is_signed_type(char)); =20 return !trace_seq_has_overflowed(s); diff --git a/kernel/trace/trace_remote.c b/kernel/trace/trace_remote.c index b8bb43b3acd2..999bf93f40c1 100644 --- a/kernel/trace/trace_remote.c +++ b/kernel/trace/trace_remote.c @@ -1128,10 +1128,145 @@ static int remote_event_callback(const char *name,= umode_t *mode, void **data, return 0; } =20 +static ssize_t remote_events_dir_enable_write(struct file *filp, const cha= r __user *ubuf, + size_t count, loff_t *ppos) +{ + struct trace_remote *remote =3D file_inode(filp)->i_private; + int i, ret; + u8 enable; + + ret =3D kstrtou8_from_user(ubuf, count, 10, &enable); + if (ret) + return ret; + + guard(mutex)(&remote->lock); + + for (i =3D 0; i < remote->nr_events; i++) { + struct remote_event *evt =3D &remote->events[i]; + + trace_remote_enable_event(remote, evt, enable); + } + + return count; +} + +static ssize_t remote_events_dir_enable_read(struct file *filp, char __use= r *ubuf, size_t cnt, + loff_t *ppos) +{ + struct trace_remote *remote =3D file_inode(filp)->i_private; + const char enabled_char[] =3D {'0', '1', 'X'}; + char enabled_str[] =3D " \n"; + int i, enabled =3D -1; + + guard(mutex)(&remote->lock); + + for (i =3D 0; i < remote->nr_events; i++) { + struct remote_event *evt =3D &remote->events[i]; + + if (enabled =3D=3D -1) { + enabled =3D evt->enabled; + } else if (enabled !=3D evt->enabled) { + enabled =3D 2; + break; + } + } + + enabled_str[0] =3D enabled_char[enabled =3D=3D -1 ? 0 : enabled]; + + return simple_read_from_buffer(ubuf, cnt, ppos, enabled_str, 2); +} + +static const struct file_operations remote_events_dir_enable_fops =3D { + .write =3D remote_events_dir_enable_write, + .read =3D remote_events_dir_enable_read, +}; + +static ssize_t +remote_events_dir_header_page_read(struct file *filp, char __user *ubuf, s= ize_t cnt, loff_t *ppos) +{ + struct trace_seq *s; + int ret; + + s =3D kmalloc(sizeof(*s), GFP_KERNEL); + if (!s) + return -ENOMEM; + + trace_seq_init(s); + + ring_buffer_print_page_header(NULL, s); + ret =3D simple_read_from_buffer(ubuf, cnt, ppos, s->buffer, trace_seq_use= d(s)); + kfree(s); + + return ret; +} + +static const struct file_operations remote_events_dir_header_page_fops =3D= { + .read =3D remote_events_dir_header_page_read, +}; + +static ssize_t +remote_events_dir_header_event_read(struct file *filp, char __user *ubuf, = size_t cnt, loff_t *ppos) +{ + struct trace_seq *s; + int ret; + + s =3D kmalloc(sizeof(*s), GFP_KERNEL); + if (!s) + return -ENOMEM; + + trace_seq_init(s); + + ring_buffer_print_entry_header(s); + ret =3D simple_read_from_buffer(ubuf, cnt, ppos, s->buffer, trace_seq_use= d(s)); + kfree(s); + + return ret; +} + +static const struct file_operations remote_events_dir_header_event_fops = =3D { + .read =3D remote_events_dir_header_event_read, +}; + +static int remote_events_dir_callback(const char *name, umode_t *mode, voi= d **data, + const struct file_operations **fops) +{ + if (!strcmp(name, "enable")) { + *mode =3D TRACEFS_MODE_WRITE; + *fops =3D &remote_events_dir_enable_fops; + return 1; + } + + if (!strcmp(name, "header_page")) { + *mode =3D TRACEFS_MODE_READ; + *fops =3D &remote_events_dir_header_page_fops; + return 1; + } + + if (!strcmp(name, "header_event")) { + *mode =3D TRACEFS_MODE_READ; + *fops =3D &remote_events_dir_header_event_fops; + return 1; + } + + return 0; +} + static int trace_remote_init_eventfs(const char *remote_name, struct trace= _remote *remote, struct remote_event *evt) { struct eventfs_inode *eventfs =3D remote->eventfs; + static struct eventfs_entry dir_entries[] =3D { + { + .name =3D "enable", + .callback =3D remote_events_dir_callback, + }, { + .name =3D "header_page", + .callback =3D remote_events_dir_callback, + }, { + .name =3D "header_event", + .callback =3D remote_events_dir_callback, + } + }; static struct eventfs_entry entries[] =3D { { .name =3D "enable", @@ -1147,7 +1282,8 @@ static int trace_remote_init_eventfs(const char *remo= te_name, struct trace_remot bool eventfs_create =3D false; =20 if (!eventfs) { - eventfs =3D eventfs_create_events_dir("events", remote->dentry, NULL, 0,= NULL); + eventfs =3D eventfs_create_events_dir("events", remote->dentry, dir_entr= ies, + ARRAY_SIZE(dir_entries), remote); if (IS_ERR(eventfs)) return PTR_ERR(eventfs); =20 --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 2026 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.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 66F4E354AD7 for ; Sat, 31 Jan 2026 13:29:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866175; cv=none; b=hNFlbCcqAjnEbcsm5rW0JpJIBNtV1x03r83rbwEgyFNWF6PWWYJXBlnqLmNx9jSzpjif4GIIr4fqFRIyKXp8yHKEqadsnbwrduymWldXiWMxEUAbt1VhF4EkqwVrUrcZGcceA3rVlxhMmD/v5Vi4CEEJ88h3zOHOykvdxAWP4kA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866175; c=relaxed/simple; bh=bH9A+PcOeaBqOY1n6QII0dmbCLpPluQkaUgm1wPBKiE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=VDAcXCHQuq6SAgJiSupmtGlIJXjoKxp35hHia6JpK3EoOkbyHIvAODVMq9GrRaIhbAfhtVw6DaDvZZk22bWDn6XVmq6N0Sah/Y8fPWWKgJaImf8gfMFVqQSDLJ+bGNyv6UFbm5ww76Zjc/X3wl0Z/t2u4hbqbq9kisfo+Be0Oz4= 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=fdP2U8s3; arc=none smtp.client-ip=209.85.218.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="fdP2U8s3" Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-b8842248611so283541266b.0 for ; Sat, 31 Jan 2026 05:29:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866172; x=1770470972; 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=cmv9pvVDnZ4go9IGE3NPxdNq415YebjgteYn5xFgp+s=; b=fdP2U8s35d1Yq1/UsRf9KYnZc+kSYYQfY0Tqgrikaz5v38q3mOMEQ+adczj1b0oDty pdmJf3VNHVylb3UkscLnM+zycjZelO4487KaKOvPtoop1iVLUT1G7sUm8OaPnmhnKBrH n5t0vPFmsNX617s/uWCf12GicMZPOQ1JnaZq6873qeA63MDFn01mSwgpJ/6zW/U4Qnh4 2ai2BGKuetmzihVhk7FyHfcFvrXPD5H9KgH7700bnhqlwW42s10oNQ7bymwVemFyO0Gx dnbwPGwNd/hsrBr/Tg0pe1WfnGu2+O00ll/ul1HrFf5AyLb+l/kSvrf3uOWsQvNVwt+R HBEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866172; x=1770470972; 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=cmv9pvVDnZ4go9IGE3NPxdNq415YebjgteYn5xFgp+s=; b=qKGzoymTL0WTQUxFwbAx35Orgfy6sKb69KvPJ2hJxhHteCn+tYiRFSGQ8AiDs5yUiO DRoebVXyHT3ttvJTNzb9ovltOjFnn41X7171tj+Dr+6tbPY2cSdDkfEYER/lazwjNLMd 7BSijPDTGI6r6xHpiz7P9ilg17lWGnMraYOUAfku/qHkTFprYMuJHOfR6OpmmQRMi2To NYwZIJLM5Y92q5fJEtnfvaiSCb6id8xuTG9AczAhJLxKdRbMAWIL/o5y5eAKga2VsjVu FS29Re5XFUai/ey7YQdpNMZbmcJVafx8XANslihCu9+d40hLWVH3U6T4hI/MqgBXgkZ+ yLQw== X-Forwarded-Encrypted: i=1; AJvYcCXka6pPi2LR2GQsiBk2Nu7UO/FDxBCZ9rV0M6QAErOHF5RV4mHyS/P400Dvo7QAVMXyRr4bHSbHqJEwNxw=@vger.kernel.org X-Gm-Message-State: AOJu0YwB/Ojq/0K8CepcNLZoCXHtIu2KeQE5LuoHxIHLiGm2dL9q6McO sYitaVeCiycit3bkmvd2zm1FReRzfRcNbG7PvvxN8J4HBwlgR24G91klCZaj9uQqd1wF+CFp+MA lqDZsphtZuskkDCj9BwlgPg== X-Received: from ejpk1.prod.google.com ([2002:a17:906:66c1:b0:b84:4fbe:af3b]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:2d1f:b0:b87:efa:8786 with SMTP id a640c23a62f3a-b8dff6f7d99mr386552866b.55.1769866171645; Sat, 31 Jan 2026 05:29:31 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:29 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-12-vdonnefort@google.com> Subject: [PATCH v11 11/30] tracing: Add helpers to create trace remote events From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Declaring remote events can be cumbersome let's add a set of macros to simplify developers life. The declaration of a remote event is very similar to kernel's events: REMOTE_EVENT(name, id, RE_STRUCT( re_field(u64 foo) ), RE_PRINTK("foo=3D%llu", __entry->foo) ) Reviewed-by: Steven Rostedt (Google) Signed-off-by: Vincent Donnefort diff --git a/include/linux/trace_remote_event.h b/include/linux/trace_remot= e_event.h index a4449008a075..c8ae1e1f5e72 100644 --- a/include/linux/trace_remote_event.h +++ b/include/linux/trace_remote_event.h @@ -5,6 +5,7 @@ =20 struct trace_remote; struct trace_event_fields; +struct trace_seq; =20 struct remote_event_hdr { unsigned short id; @@ -20,4 +21,13 @@ struct remote_event { char *print_fmt; void (*print)(void *evt, struct trace_seq *seq); }; + +#define RE_STRUCT(__args...) __args +#define re_field(__type, __field) __type __field; + +#define REMOTE_EVENT_FORMAT(__name, __struct) \ + struct remote_event_format_##__name { \ + struct remote_event_hdr hdr; \ + __struct \ + } #endif diff --git a/include/trace/define_remote_events.h b/include/trace/define_re= mote_events.h new file mode 100644 index 000000000000..676e803dc144 --- /dev/null +++ b/include/trace/define_remote_events.h @@ -0,0 +1,73 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include +#include +#include +#include + +#define REMOTE_EVENT_INCLUDE(__file) __stringify(../../__file) + +#ifdef REMOTE_EVENT_SECTION +# define __REMOTE_EVENT_SECTION(__name) __used __section(REMOTE_EVENT_SECT= ION"."#__name) +#else +# define __REMOTE_EVENT_SECTION(__name) +#endif + +#define REMOTE_PRINTK_COUNT_ARGS(__args...) \ + __COUNT_ARGS(, ##__args, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 0) + +#define __remote_printk0() \ + trace_seq_putc(seq, '\n') + +#define __remote_printk1(__fmt) \ + trace_seq_puts(seq, " " __fmt "\n") \ + +#define __remote_printk2(__fmt, __args...) \ +do { \ + trace_seq_putc(seq, ' '); \ + trace_seq_printf(seq, __fmt, __args); \ + trace_seq_putc(seq, '\n'); \ +} while (0) + +/* Apply the appropriate trace_seq sequence according to the number of arg= uments */ +#define remote_printk(__args...) \ + CONCATENATE(__remote_printk, REMOTE_PRINTK_COUNT_ARGS(__args))(__args) + +#define RE_PRINTK(__args...) __args + +#define REMOTE_EVENT(__name, __id, __struct, __printk) \ + REMOTE_EVENT_FORMAT(__name, __struct); \ + static void remote_event_print_##__name(void *evt, struct trace_seq *seq)= \ + { \ + struct remote_event_format_##__name __maybe_unused *__entry =3D evt; \ + trace_seq_puts(seq, #__name); \ + remote_printk(__printk); \ + } +#include REMOTE_EVENT_INCLUDE(REMOTE_EVENT_INCLUDE_FILE) + +#undef REMOTE_EVENT +#undef RE_PRINTK +#undef re_field +#define re_field(__type, __field) \ + { \ + .type =3D #__type, .name =3D #__field, \ + .size =3D sizeof(__type), .align =3D __alignof__(__type), \ + .is_signed =3D is_signed_type(__type), \ + }, +#define __entry REC +#define RE_PRINTK(__fmt, __args...) "\"" __fmt "\", " __stringify(__args) +#define REMOTE_EVENT(__name, __id, __struct, __printk) \ + static struct trace_event_fields remote_event_fields_##__name[] =3D { \ + __struct \ + {} \ + }; \ + static char remote_event_print_fmt_##__name[] =3D __printk; \ + static struct remote_event __REMOTE_EVENT_SECTION(__name) \ + remote_event_##__name =3D { \ + .name =3D #__name, \ + .id =3D __id, \ + .fields =3D remote_event_fields_##__name, \ + .print_fmt =3D remote_event_print_fmt_##__name, \ + .print =3D remote_event_print_##__name, \ + } +#include REMOTE_EVENT_INCLUDE(REMOTE_EVENT_INCLUDE_FILE) --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 4FE903559E8 for ; Sat, 31 Jan 2026 13:29:34 +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=1769866176; cv=none; b=bMhlS/6JiUDQeDk/1xyayRNHIkhDlZiGoNwwghQoawnQjCt8FgGeewwYffNoX9AbwVedytsz6qs71vQ3p0LB1n8eoEteZppLoBvM6151dvIrI9Qq2WHLrvvMd70MZ32N7zRjUujPm46757aql6L17vqHFCzKg/S8YsTvUnHZ9CM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866176; c=relaxed/simple; bh=myEoHDo3MPvls1vMiU/YVxxWDnISAX7i+kXR3tGbZj4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=g5zqWv9b31y136jFnWMsF1c6/Njgsn1MyPgMsN1Mo3LIppL+6nthMm2BZDOFnWVoM2wG4/ywlzDHrFF3efyf9mcPuwmoUr0v1Naq6+iVLLSQdhMxIX18PHh4ErhL/++S6VGjiKrz2mc8QzEotCVYrvYFG6+oUJPl8bbiNmvURCQ= 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=hjm5GoRF; 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="hjm5GoRF" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4804157a3c9so36044845e9.1 for ; Sat, 31 Jan 2026 05:29:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866172; x=1770470972; 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=pBD976xrFPJmXmNtnpgAPvl5e9LpDIznbYBPc6HUC2I=; b=hjm5GoRFG/5KTBiu1sDHMxJk2qnDaMkyxjFGQpzEDyI/qvdSOm4bsZoMy5B/o1T1u9 IH0hk7/PlpF3n2D+OUvQ3edkgsHhqwMSymT85XCCGuMPFUXGu1qilkVX1iR2s5mU+WZT /cwhJ0Nz5DE10rxP6HkkV0EHDNnIu2OOBYI7BmBeNSN1wXRfrNUTvQ205qk62SKnx8pg +1geFyQkFbuZX/B0npFsh42K5TgFNF2tT9nkWh6LMDHIgJFrQDs8qvZbiG4nBMj6JOHi ykITY0G7qsT4TS8w8OLyLF9Pzx69moevUw6E8zhv38LhYfv3OifjzYr0hEmm/Wln0pYG G7Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866172; x=1770470972; 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=pBD976xrFPJmXmNtnpgAPvl5e9LpDIznbYBPc6HUC2I=; b=Gp+A2Dyrr/FmILbkiao6XoYB9Omjo6sTqkxt9EgHhphfw4W76wYRy03mt/JfWDs8ug 3S/BoGMnOs5+qYg9fNhnAeQgFCdTXqZ5alIyk1qN4bc/mDSLxjv6ydMIpSalOtX4sf8s 967soNEA2mlsiM4Xrt5dvFdOrHCScRyjVLLqaalJuxclz/+AHA/x6UEKLRip97+IeDsM Dpn+TaqDNnHkvFltZElzqSUoE03d2jSTLRDErIWFBE4Y+bgEnQ3hJp0pZwBAffmC9qGy Lwt16xxKLRFmMrK7RGBXhRpryoUkQs5QJs3wB+lxfUr3VuQKReQLNhH2ggzZmIuPL3UL 97lg== X-Forwarded-Encrypted: i=1; AJvYcCX3MWAyNSIGNuupmrhxW3LkbD/NJ3naf0QdJ/3wYtCW2pOQkG9rMgUBZXTDz7F8W8THhG99yvvzr41W8KU=@vger.kernel.org X-Gm-Message-State: AOJu0YyXb9cslnjw8oKXuSxTzb6SVQaYnbV0nkvD9u6kB2yGWuzdNVHy kSgHtOxH10sKQvS55miFD2iNvynYg/2YcE2buSjq49PRuzkvJEcO1nagUt5FZuTKToad8S+s43i l5y0UZYjQTKzt8WoO2ULQIA== X-Received: from wmil13.prod.google.com ([2002:a7b:c44d:0:b0:480:4a03:7b60]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3b1e:b0:477:58af:a91d with SMTP id 5b1f17b1804b1-482db4569b5mr71334045e9.5.1769866172683; Sat, 31 Jan 2026 05:29:32 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:30 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-13-vdonnefort@google.com> Subject: [PATCH v11 12/30] ring-buffer: Export buffer_data_page and macros From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In preparation for allowing the writing of ring-buffer compliant pages outside of ring_buffer.c, move buffer_data_page and timestamps encoding macros into the publicly available ring_buffer_types.h. Reviewed-by: Steven Rostedt (Google) Signed-off-by: Vincent Donnefort diff --git a/include/linux/ring_buffer_types.h b/include/linux/ring_buffer_= types.h new file mode 100644 index 000000000000..54577021a49d --- /dev/null +++ b/include/linux/ring_buffer_types.h @@ -0,0 +1,41 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_RING_BUFFER_TYPES_H +#define _LINUX_RING_BUFFER_TYPES_H + +#include + +#define TS_SHIFT 27 +#define TS_MASK ((1ULL << TS_SHIFT) - 1) +#define TS_DELTA_TEST (~TS_MASK) + +/* + * We need to fit the time_stamp delta into 27 bits. + */ +static inline bool test_time_stamp(u64 delta) +{ + return !!(delta & TS_DELTA_TEST); +} + +#define BUF_PAGE_HDR_SIZE offsetof(struct buffer_data_page, data) + +#define RB_EVNT_HDR_SIZE (offsetof(struct ring_buffer_event, array)) +#define RB_ALIGNMENT 4U +#define RB_MAX_SMALL_DATA (RB_ALIGNMENT * RINGBUF_TYPE_DATA_TYPE_LEN_MAX) +#define RB_EVNT_MIN_SIZE 8U /* two 32bit words */ + +#ifndef CONFIG_HAVE_64BIT_ALIGNED_ACCESS +# define RB_FORCE_8BYTE_ALIGNMENT 0 +# define RB_ARCH_ALIGNMENT RB_ALIGNMENT +#else +# define RB_FORCE_8BYTE_ALIGNMENT 1 +# define RB_ARCH_ALIGNMENT 8U +#endif + +#define RB_ALIGN_DATA __aligned(RB_ARCH_ALIGNMENT) + +struct buffer_data_page { + u64 time_stamp; /* page time stamp */ + local_t commit; /* write committed index */ + unsigned char data[] RB_ALIGN_DATA; /* data of buffer page */ +}; +#endif diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index e28cc02d1a70..d604377f2184 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -4,6 +4,7 @@ * * Copyright (C) 2008 Steven Rostedt */ +#include #include #include #include @@ -156,23 +157,6 @@ int ring_buffer_print_entry_header(struct trace_seq *s) /* Used for individual buffers (after the counter) */ #define RB_BUFFER_OFF (1 << 20) =20 -#define BUF_PAGE_HDR_SIZE offsetof(struct buffer_data_page, data) - -#define RB_EVNT_HDR_SIZE (offsetof(struct ring_buffer_event, array)) -#define RB_ALIGNMENT 4U -#define RB_MAX_SMALL_DATA (RB_ALIGNMENT * RINGBUF_TYPE_DATA_TYPE_LEN_MAX) -#define RB_EVNT_MIN_SIZE 8U /* two 32bit words */ - -#ifndef CONFIG_HAVE_64BIT_ALIGNED_ACCESS -# define RB_FORCE_8BYTE_ALIGNMENT 0 -# define RB_ARCH_ALIGNMENT RB_ALIGNMENT -#else -# define RB_FORCE_8BYTE_ALIGNMENT 1 -# define RB_ARCH_ALIGNMENT 8U -#endif - -#define RB_ALIGN_DATA __aligned(RB_ARCH_ALIGNMENT) - /* define RINGBUF_TYPE_DATA for 'case RINGBUF_TYPE_DATA:' */ #define RINGBUF_TYPE_DATA 0 ... RINGBUF_TYPE_DATA_TYPE_LEN_MAX =20 @@ -315,10 +299,6 @@ EXPORT_SYMBOL_GPL(ring_buffer_event_data); #define for_each_online_buffer_cpu(buffer, cpu) \ for_each_cpu_and(cpu, buffer->cpumask, cpu_online_mask) =20 -#define TS_SHIFT 27 -#define TS_MASK ((1ULL << TS_SHIFT) - 1) -#define TS_DELTA_TEST (~TS_MASK) - static u64 rb_event_time_stamp(struct ring_buffer_event *event) { u64 ts; @@ -337,12 +317,6 @@ static u64 rb_event_time_stamp(struct ring_buffer_even= t *event) =20 #define RB_MISSED_MASK (3 << 30) =20 -struct buffer_data_page { - u64 time_stamp; /* page time stamp */ - local_t commit; /* write committed index */ - unsigned char data[] RB_ALIGN_DATA; /* data of buffer page */ -}; - struct buffer_data_read_page { unsigned order; /* order of the page */ struct buffer_data_page *data; /* actual data, stored in this page */ @@ -436,14 +410,6 @@ static struct buffer_data_page *alloc_cpu_data(int cpu= , int order) return dpage; } =20 -/* - * We need to fit the time_stamp delta into 27 bits. - */ -static inline bool test_time_stamp(u64 delta) -{ - return !!(delta & TS_DELTA_TEST); -} - struct rb_irq_work { struct irq_work work; wait_queue_head_t waiters; --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 2026 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.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 512D63563FB for ; Sat, 31 Jan 2026 13:29:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866178; cv=none; b=crO/NsKRULBXU1nb4kyU41upOvh9S7zjYAyUwzvEFZW7VS021t4XycWxYeJtrtUFE/LBIjkrehYq8CTbZPKSmpwJNVt3+NvlFMeqq1QgZEkpz210DIkaW7Wbahty8uRFg7mrZdw01rje3WXxFXW2sjxAFjTMF7AbHxHUe/MdKTc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866178; c=relaxed/simple; bh=yYzgbs42z2K+NzUsUbkOO65yONIIxWZQzPqUptTHLsQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Bc9ieyVjSbhmiZ2WQWie4V0fGxO58ayUmZJSWeBxFmRB/44wOjxssxhAd3NuwmggDkYSGed26cAVOd7QDbavfk0T/mtHibD5HUi4IADYKp2pFv9Rodt7p8htQ7C7j9xTD9HfMAJQPmb2xScRLFhBmbNxTPKuDAED5KlG1jfS1lw= 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=1CEWKDpM; arc=none smtp.client-ip=209.85.208.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="1CEWKDpM" Received: by mail-ed1-f74.google.com with SMTP id 4fb4d7f45d1cf-658b9bfaa1cso2934034a12.1 for ; Sat, 31 Jan 2026 05:29:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866174; x=1770470974; 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=4SdBsExCPXKp2u6EF5kphh7WRFLPM2LeRbrMp4xM9wk=; b=1CEWKDpM7xu3qtw1HOFj7QN55PYPYq42LOTLtL9I7QgsrMJzQK6/Q4dUFHJ3gGbOFX oE1d/+NaP/bzK1Vrtn4UhHkTJvQEry4KrpXuYlzO8Mii9z2WZARmI3wSE4Z7+g4VJCUx IfMtJ/fClceSJFfMrjeSlw+NZDzPMeFd5HCmxsFDWYxo4u46qSbykyKEVXiJZ4lOE8Js CtE0pEbthi9mPw2YD3Y/tUqySgp2ftBrI8BRD910NejIiTrF2710qvyR4AUMXV9Bqlt1 2BWsFmnBLkchnizPFCtlJOjyZaNmWnn7Q9DdL4p2L1prkMoJa3fg5b/KMeELIWhhALbY xrvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866174; x=1770470974; 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=4SdBsExCPXKp2u6EF5kphh7WRFLPM2LeRbrMp4xM9wk=; b=oB1cB/Psm50/WzxM3PVgMeHURrqDsu8Y+Yhi2//TAKWoQ9Ru3jDwteXQ0m2JwVZpDH G7V+sCStrGbQvcubFdp9frZHn992orfWZAxRRs8s1qDlwTbJ/Sz5TPAN31EIrftcwGOL 5L08cz3I2W1VyspJpccdGt2ImXRX446XBxwCghmz4KvMb7Syrr0gVQO2KLF9oUr/JkmW 0uYDvKKaKDelA7esXzumVcuSRFmAl38IkrqeBPQEPQYWgJOX2xbGMpaYbJm51bVi0e8f RrXYmLp/mgDXIFVEbkH8l+L+Iun8+880RlK376H6HeqP+Bu9KazLLT7lOfsyDh3m7SYh CH8A== X-Forwarded-Encrypted: i=1; AJvYcCV0oiQKykcpK4LDzapnf/pkY0wU6k8QNOMkIS4jEdPTc4VKym0sjR4t6n2vXIbGRVwrGte9I3vrWeincWE=@vger.kernel.org X-Gm-Message-State: AOJu0YyqLy/g/49b6kIgWcu2amuLOuVZO6UX/yEJzP0sdHCa9MECoQ5t axlbev7sA/j1KtB6GEQ61wmTyIHpqBy1rAQWSxSAZreFxIk11/vmJ97IP0Ek4d3lnBF5z96PTls KnmkJ9RR6sD+4tecooxv3Ow== X-Received: from edbch28.prod.google.com ([2002:a05:6402:1bdc:b0:658:ed9:ddfc]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:26c5:b0:658:c1d2:baab with SMTP id 4fb4d7f45d1cf-658de5518c1mr3934053a12.10.1769866173694; Sat, 31 Jan 2026 05:29:33 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:31 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-14-vdonnefort@google.com> Subject: [PATCH v11 13/30] tracing: Introduce simple_ring_buffer From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a simple implementation of the kernel ring-buffer. This intends to be used later by ring-buffer remotes such as the pKVM hypervisor, hence the need for a cut down version (write only) without any dependency. Signed-off-by: Vincent Donnefort diff --git a/include/linux/simple_ring_buffer.h b/include/linux/simple_ring= _buffer.h new file mode 100644 index 000000000000..2c4c0ae336bc Reviewed-by: Steven Rostedt (Google) --- /dev/null +++ b/include/linux/simple_ring_buffer.h @@ -0,0 +1,57 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_SIMPLE_RING_BUFFER_H +#define _LINUX_SIMPLE_RING_BUFFER_H + +#include +#include +#include +#include + +/* + * Ideally those struct would stay private but the caller needs to know + * the allocation size for simple_ring_buffer_init(). + */ +struct simple_buffer_page { + struct list_head link; + struct buffer_data_page *page; + u64 entries; + u32 write; + u32 id; +}; + +struct simple_rb_per_cpu { + struct simple_buffer_page *tail_page; + struct simple_buffer_page *reader_page; + struct simple_buffer_page *head_page; + struct simple_buffer_page *bpages; + struct trace_buffer_meta *meta; + u32 nr_pages; + +#define SIMPLE_RB_UNAVAILABLE 0 +#define SIMPLE_RB_READY 1 +#define SIMPLE_RB_WRITING 2 + u32 status; + + u64 last_overrun; + u64 write_stamp; + + struct simple_rb_cbs *cbs; +}; + +int simple_ring_buffer_init(struct simple_rb_per_cpu *cpu_buffer, struct s= imple_buffer_page *bpages, + const struct ring_buffer_desc *desc); + +void simple_ring_buffer_unload(struct simple_rb_per_cpu *cpu_buffer); + +void *simple_ring_buffer_reserve(struct simple_rb_per_cpu *cpu_buffer, uns= igned long length, + u64 timestamp); + +void simple_ring_buffer_commit(struct simple_rb_per_cpu *cpu_buffer); + +int simple_ring_buffer_enable_tracing(struct simple_rb_per_cpu *cpu_buffer= , bool enable); + +int simple_ring_buffer_reset(struct simple_rb_per_cpu *cpu_buffer); + +int simple_ring_buffer_swap_reader_page(struct simple_rb_per_cpu *cpu_buff= er); + +#endif diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 135edf143073..dfaf1af8862e 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -1281,4 +1281,7 @@ source "kernel/trace/rv/Kconfig" config TRACE_REMOTE bool =20 +config SIMPLE_RING_BUFFER + bool + endif # FTRACE diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index 6e75d710fc25..efe12e282f8c 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile @@ -128,4 +128,5 @@ obj-$(CONFIG_TRACEPOINT_BENCHMARK) +=3D trace_benchmark= .o obj-$(CONFIG_RV) +=3D rv/ =20 obj-$(CONFIG_TRACE_REMOTE) +=3D trace_remote.o +obj-$(CONFIG_SIMPLE_RING_BUFFER) +=3D simple_ring_buffer.o libftrace-y :=3D ftrace.o diff --git a/kernel/trace/simple_ring_buffer.c b/kernel/trace/simple_ring_b= uffer.c new file mode 100644 index 000000000000..88afd28ffef7 --- /dev/null +++ b/kernel/trace/simple_ring_buffer.c @@ -0,0 +1,471 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2025 - Google LLC + * Author: Vincent Donnefort + */ + +#include +#include + +#include +#include + +enum simple_rb_link_type { + SIMPLE_RB_LINK_NORMAL =3D 0, + SIMPLE_RB_LINK_HEAD =3D 1, + SIMPLE_RB_LINK_HEAD_MOVING +}; + +#define SIMPLE_RB_LINK_MASK ~(SIMPLE_RB_LINK_HEAD | SIMPLE_RB_LINK_HEAD_MO= VING) + +static void simple_bpage_set_head_link(struct simple_buffer_page *bpage) +{ + unsigned long link =3D (unsigned long)bpage->link.next; + + link &=3D SIMPLE_RB_LINK_MASK; + link |=3D SIMPLE_RB_LINK_HEAD; + + /* + * Paired with simple_rb_find_head() to order access between the head + * link and overrun. It ensures we always report an up-to-date value + * after swapping the reader page. + */ + smp_store_release(&bpage->link.next, (struct list_head *)link); +} + +static bool simple_bpage_unset_head_link(struct simple_buffer_page *bpage, + struct simple_buffer_page *dst, + enum simple_rb_link_type new_type) +{ + unsigned long *link =3D (unsigned long *)(&bpage->link.next); + unsigned long old =3D (*link & SIMPLE_RB_LINK_MASK) | SIMPLE_RB_LINK_HEAD; + unsigned long new =3D (unsigned long)(&dst->link) | new_type; + + return try_cmpxchg(link, &old, new); +} + +static void simple_bpage_set_normal_link(struct simple_buffer_page *bpage) +{ + unsigned long link =3D (unsigned long)bpage->link.next; + + WRITE_ONCE(bpage->link.next, (struct list_head *)(link & SIMPLE_RB_LINK_M= ASK)); +} + +static struct simple_buffer_page *simple_bpage_from_link(struct list_head = *link) +{ + unsigned long ptr =3D (unsigned long)link & SIMPLE_RB_LINK_MASK; + + return container_of((struct list_head *)ptr, struct simple_buffer_page, l= ink); +} + +static struct simple_buffer_page *simple_bpage_next_page(struct simple_buf= fer_page *bpage) +{ + return simple_bpage_from_link(bpage->link.next); +} + +static void simple_bpage_reset(struct simple_buffer_page *bpage) +{ + bpage->write =3D 0; + bpage->entries =3D 0; + + local_set(&bpage->page->commit, 0); +} + +static void simple_bpage_init(struct simple_buffer_page *bpage, unsigned l= ong page) +{ + INIT_LIST_HEAD(&bpage->link); + bpage->page =3D (struct buffer_data_page *)page; + + simple_bpage_reset(bpage); +} + +#define simple_rb_meta_inc(__meta, __inc) \ + WRITE_ONCE((__meta), (__meta + __inc)) + +static bool simple_rb_loaded(struct simple_rb_per_cpu *cpu_buffer) +{ + return !!cpu_buffer->bpages; +} + +static int simple_rb_find_head(struct simple_rb_per_cpu *cpu_buffer) +{ + int retry =3D cpu_buffer->nr_pages * 2; + struct simple_buffer_page *head; + + head =3D cpu_buffer->head_page; + + while (retry--) { + unsigned long link; + +spin: + /* See smp_store_release in simple_bpage_set_head_link() */ + link =3D (unsigned long)smp_load_acquire(&head->link.prev->next); + + switch (link & ~SIMPLE_RB_LINK_MASK) { + /* Found the head */ + case SIMPLE_RB_LINK_HEAD: + cpu_buffer->head_page =3D head; + return 0; + /* The writer caught the head, we can spin, that won't be long */ + case SIMPLE_RB_LINK_HEAD_MOVING: + goto spin; + } + + head =3D simple_bpage_next_page(head); + } + + return -EBUSY; +} + +/** + * simple_ring_buffer_swap_reader_page - Swap ring-buffer head with the re= ader + * + * This function enables consuming reading. It ensures the current head pa= ge will not be overwritten + * and can be safely read. + * + * @cpu_buffer: A simple_rb_per_cpu + * + * Returns 0 on success, -ENODEV if @cpu_buffer was unloaded or -EBUSY if = we failed to catch the + * head page. + */ +int simple_ring_buffer_swap_reader_page(struct simple_rb_per_cpu *cpu_buff= er) +{ + struct simple_buffer_page *last, *head, *reader; + unsigned long overrun; + int retry =3D 8; + int ret; + + if (!simple_rb_loaded(cpu_buffer)) + return -ENODEV; + + reader =3D cpu_buffer->reader_page; + + do { + /* Run after the writer to find the head */ + ret =3D simple_rb_find_head(cpu_buffer); + if (ret) + return ret; + + head =3D cpu_buffer->head_page; + + /* Connect the reader page around the header page */ + reader->link.next =3D head->link.next; + reader->link.prev =3D head->link.prev; + + /* The last page before the head */ + last =3D simple_bpage_from_link(head->link.prev); + + /* The reader page points to the new header page */ + simple_bpage_set_head_link(reader); + + overrun =3D cpu_buffer->meta->overrun; + } while (!simple_bpage_unset_head_link(last, reader, SIMPLE_RB_LINK_NORMA= L) && retry--); + + if (!retry) + return -EINVAL; + + cpu_buffer->head_page =3D simple_bpage_from_link(reader->link.next); + cpu_buffer->head_page->link.prev =3D &reader->link; + cpu_buffer->reader_page =3D head; + cpu_buffer->meta->reader.lost_events =3D overrun - cpu_buffer->last_overr= un; + cpu_buffer->meta->reader.id =3D cpu_buffer->reader_page->id; + cpu_buffer->last_overrun =3D overrun; + + return 0; +} +EXPORT_SYMBOL_GPL(simple_ring_buffer_swap_reader_page); + +static struct simple_buffer_page *simple_rb_move_tail(struct simple_rb_per= _cpu *cpu_buffer) +{ + struct simple_buffer_page *tail, *new_tail; + + tail =3D cpu_buffer->tail_page; + new_tail =3D simple_bpage_next_page(tail); + + if (simple_bpage_unset_head_link(tail, new_tail, SIMPLE_RB_LINK_HEAD_MOVI= NG)) { + /* + * Oh no! we've caught the head. There is none anymore and + * swap_reader will spin until we set the new one. Overrun must + * be written first, to make sure we report the correct number + * of lost events. + */ + simple_rb_meta_inc(cpu_buffer->meta->overrun, new_tail->entries); + simple_rb_meta_inc(cpu_buffer->meta->pages_lost, 1); + + simple_bpage_set_head_link(new_tail); + simple_bpage_set_normal_link(tail); + } + + simple_bpage_reset(new_tail); + cpu_buffer->tail_page =3D new_tail; + + simple_rb_meta_inc(cpu_buffer->meta->pages_touched, 1); + + return new_tail; +} + +static unsigned long rb_event_size(unsigned long length) +{ + struct ring_buffer_event *event; + + return length + RB_EVNT_HDR_SIZE + sizeof(event->array[0]); +} + +static struct ring_buffer_event * +rb_event_add_ts_extend(struct ring_buffer_event *event, u64 delta) +{ + event->type_len =3D RINGBUF_TYPE_TIME_EXTEND; + event->time_delta =3D delta & TS_MASK; + event->array[0] =3D delta >> TS_SHIFT; + + return (struct ring_buffer_event *)((unsigned long)event + 8); +} + +static struct ring_buffer_event * +simple_rb_reserve_next(struct simple_rb_per_cpu *cpu_buffer, unsigned long= length, u64 timestamp) +{ + unsigned long ts_ext_size =3D 0, event_size =3D rb_event_size(length); + struct simple_buffer_page *tail =3D cpu_buffer->tail_page; + struct ring_buffer_event *event; + u32 write, prev_write; + u64 time_delta; + + time_delta =3D timestamp - cpu_buffer->write_stamp; + + if (test_time_stamp(time_delta)) + ts_ext_size =3D 8; + + prev_write =3D tail->write; + write =3D prev_write + event_size + ts_ext_size; + + if (unlikely(write > (PAGE_SIZE - BUF_PAGE_HDR_SIZE))) + tail =3D simple_rb_move_tail(cpu_buffer); + + if (!tail->entries) { + tail->page->time_stamp =3D timestamp; + time_delta =3D 0; + ts_ext_size =3D 0; + write =3D event_size; + prev_write =3D 0; + } + + tail->write =3D write; + tail->entries++; + + cpu_buffer->write_stamp =3D timestamp; + + event =3D (struct ring_buffer_event *)(tail->page->data + prev_write); + if (ts_ext_size) { + event =3D rb_event_add_ts_extend(event, time_delta); + time_delta =3D 0; + } + + event->type_len =3D 0; + event->time_delta =3D time_delta; + event->array[0] =3D event_size - RB_EVNT_HDR_SIZE; + + return event; +} + +/** + * simple_ring_buffer_reserve - Reserve an entry in @cpu_buffer + * + * @cpu_buffer: A simple_rb_per_cpu + * @length: Size of the entry in bytes + * @timestamp: Timestamp of the entry + * + * Returns the address of the entry where to write data or NULL + */ +void *simple_ring_buffer_reserve(struct simple_rb_per_cpu *cpu_buffer, uns= igned long length, + u64 timestamp) +{ + struct ring_buffer_event *rb_event; + + if (cmpxchg(&cpu_buffer->status, SIMPLE_RB_READY, SIMPLE_RB_WRITING) !=3D= SIMPLE_RB_READY) + return NULL; + + rb_event =3D simple_rb_reserve_next(cpu_buffer, length, timestamp); + + return &rb_event->array[1]; +} +EXPORT_SYMBOL_GPL(simple_ring_buffer_reserve); + +/** + * simple_ring_buffer_commit - Commit the entry reserved with simple_ring_= buffer_reserve() + * + * @cpu_buffer: The simple_rb_per_cpu where the entry has been reserved + */ +void simple_ring_buffer_commit(struct simple_rb_per_cpu *cpu_buffer) +{ + local_set(&cpu_buffer->tail_page->page->commit, + cpu_buffer->tail_page->write); + simple_rb_meta_inc(cpu_buffer->meta->entries, 1); + + /* + * Paired with simple_rb_enable_tracing() to ensure data is + * written to the ring-buffer before teardown. + */ + smp_store_release(&cpu_buffer->status, SIMPLE_RB_READY); +} +EXPORT_SYMBOL_GPL(simple_ring_buffer_commit); + +static u32 simple_rb_enable_tracing(struct simple_rb_per_cpu *cpu_buffer, = bool enable) +{ + u32 prev_status; + + if (enable) + return cmpxchg(&cpu_buffer->status, SIMPLE_RB_UNAVAILABLE, SIMPLE_RB_REA= DY); + + /* Wait for the buffer to be released */ + do { + prev_status =3D cmpxchg_acquire(&cpu_buffer->status, + SIMPLE_RB_READY, + SIMPLE_RB_UNAVAILABLE); + } while (prev_status =3D=3D SIMPLE_RB_WRITING); + + return prev_status; +} + +/** + * simple_ring_buffer_reset - Reset @cpu_buffer + * + * @cpu_buffer: A simple_rb_per_cpu + * + * This will not clear the content of the data, only reset counters and po= inters + * + * Returns 0 on success or -ENODEV if @cpu_buffer was unloaded. + */ +int simple_ring_buffer_reset(struct simple_rb_per_cpu *cpu_buffer) +{ + struct simple_buffer_page *bpage; + u32 prev_status; + int ret; + + if (!simple_rb_loaded(cpu_buffer)) + return -ENODEV; + + prev_status =3D simple_rb_enable_tracing(cpu_buffer, false); + + ret =3D simple_rb_find_head(cpu_buffer); + if (ret) + return ret; + + bpage =3D cpu_buffer->tail_page =3D cpu_buffer->head_page; + do { + simple_bpage_reset(bpage); + bpage =3D simple_bpage_next_page(bpage); + } while (bpage !=3D cpu_buffer->head_page); + + simple_bpage_reset(cpu_buffer->reader_page); + + cpu_buffer->last_overrun =3D 0; + cpu_buffer->write_stamp =3D 0; + + cpu_buffer->meta->reader.read =3D 0; + cpu_buffer->meta->reader.lost_events =3D 0; + cpu_buffer->meta->entries =3D 0; + cpu_buffer->meta->overrun =3D 0; + cpu_buffer->meta->read =3D 0; + cpu_buffer->meta->pages_lost =3D 0; + cpu_buffer->meta->pages_touched =3D 0; + + if (prev_status =3D=3D SIMPLE_RB_READY) + simple_rb_enable_tracing(cpu_buffer, true); + + return 0; +} +EXPORT_SYMBOL_GPL(simple_ring_buffer_reset); + +/** + * simple_ring_buffer_init - Init @cpu_buffer based on @desc + * + * @cpu_buffer: A simple_rb_per_cpu buffer to init, allocated by the calle= r. + * @bpages: Array of simple_buffer_pages, with as many elements as @desc->= nr_page_va + * @desc: A ring_buffer_desc + * + * Returns: 0 on success or -EINVAL if the content of @desc is invalid + */ +int simple_ring_buffer_init(struct simple_rb_per_cpu *cpu_buffer, struct s= imple_buffer_page *bpages, + const struct ring_buffer_desc *desc) +{ + struct simple_buffer_page *bpage =3D bpages; + int i; + + /* At least 1 reader page and two pages in the ring-buffer */ + if (desc->nr_page_va < 3) + return -EINVAL; + + memset(cpu_buffer, 0, sizeof(*cpu_buffer)); + + cpu_buffer->bpages =3D bpages; + + cpu_buffer->meta =3D (void *)desc->meta_va; + memset(cpu_buffer->meta, 0, sizeof(*cpu_buffer->meta)); + cpu_buffer->meta->meta_page_size =3D PAGE_SIZE; + cpu_buffer->meta->nr_subbufs =3D cpu_buffer->nr_pages; + + /* The reader page is not part of the ring initially */ + simple_bpage_init(bpage, desc->page_va[0]); + bpage->id =3D 0; + + cpu_buffer->nr_pages =3D 1; + + cpu_buffer->reader_page =3D bpage; + cpu_buffer->tail_page =3D bpage + 1; + cpu_buffer->head_page =3D bpage + 1; + + for (i =3D 1; i < desc->nr_page_va; i++) { + simple_bpage_init(++bpage, desc->page_va[i]); + + bpage->link.next =3D &(bpage + 1)->link; + bpage->link.prev =3D &(bpage - 1)->link; + bpage->id =3D i; + + cpu_buffer->nr_pages =3D i + 1; + } + + /* Close the ring */ + bpage->link.next =3D &cpu_buffer->tail_page->link; + cpu_buffer->tail_page->link.prev =3D &bpage->link; + + /* The last init'ed page points to the head page */ + simple_bpage_set_head_link(bpage); + + return 0; +} +EXPORT_SYMBOL_GPL(simple_ring_buffer_init); + +/** + * simple_ring_buffer_unload - Prepare @cpu_buffer for deletion + * + * @cpu_buffer: A simple_rb_per_cpu that will be deleted. + */ +void simple_ring_buffer_unload(struct simple_rb_per_cpu *cpu_buffer) +{ + if (!simple_rb_loaded(cpu_buffer)) + return; + + simple_rb_enable_tracing(cpu_buffer, false); + + cpu_buffer->bpages =3D NULL; +} +EXPORT_SYMBOL_GPL(simple_ring_buffer_unload); + +/** + * simple_ring_buffer_enable_tracing - Enable or disable writing to @cpu_b= uffer + * + * @cpu_buffer: A simple_rb_per_cpu + * @enable: True to enable tracing, False to disable it + * + * Returns 0 on success or -ENODEV if @cpu_buffer was unloaded + */ +int simple_ring_buffer_enable_tracing(struct simple_rb_per_cpu *cpu_buffer= , bool enable) +{ + if (!simple_rb_loaded(cpu_buffer)) + return -ENODEV; + + simple_rb_enable_tracing(cpu_buffer, enable); + + return 0; +} +EXPORT_SYMBOL_GPL(simple_ring_buffer_enable_tracing); --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 20B29356A27 for ; Sat, 31 Jan 2026 13:29:36 +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=1769866178; cv=none; b=HJcOr1IgZAEveuPUdGC+xqXFpSagGxLQygy88DcZ6o2tTMFLeXTY59SwwabTJZzc97EUxGc9PpKt8md2I01Us41BL9IOMa4iofWf0PpUFdPIWj90rSXCLYN4u+NW3Qw2+apvpysZErJ06sXEXx9MYB1dO1VxsNJ6eCXfI7qGNvs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866178; c=relaxed/simple; bh=SAg/QRKyrbgHEp1fTa+zbWSVct2QbQSaq19HtMlLN1Y=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=oCiPZtVNd8cUmOJ/8ZT2lqAdxRJD3sbhpEg2ma8oWU1HSenqL1dibvqYgxK/nBSxqWvJWM54P0eNRYYGFtMniAnlOwz1jonOJMUgqQoy5ojRXOkAaBMZJT3kDa2saUl5PAWsGxYkP9WRgq323q2rFnHDzyTTXkpzqF59o97mUSE= 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=abNgIesQ; 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="abNgIesQ" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-47ee432070aso23649845e9.1 for ; Sat, 31 Jan 2026 05:29:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866174; x=1770470974; 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=G4vLU6pWoLf5S1r0b3dHdABaGgiEgc6d2N6Zn8cs+5E=; b=abNgIesQ3eiMSfx7hr/Om6yJgrVvAdryHFeL7hIwBaiIY2Nxk2zjqhXOTapBEE9WY8 tPljxjA+WNdLoPCeQC9Aj153KRBNm1tbY9mvf9xW8NESmID6ZWyRrwCRx6CeGDFm1Ep/ yjixM6cLzHPG+GRm2vHrUDNZ+FBa3D2njGzSy4IfvUQFgyxUXNKwEaRP+qp1dKv51atG 7nRIP2lZxGUb+5Z3Z/gduk7nm9HHb3EYl8hvj5cQmTS1lNQkA33vGU8UQaGUaJ89lKlp KrjF3Kt9oh9A901vNSHt9wX8etBKY5MBoGnWXJMHXcNpPbu1PE4hrLhJFjpXTFLxxxEb RsEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866174; x=1770470974; 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=G4vLU6pWoLf5S1r0b3dHdABaGgiEgc6d2N6Zn8cs+5E=; b=wKngNkOAT30EDpA66eSezcQAiGXVnTJOZr3u1w7cx4SmcCiBpqpNSfIVaVGswAC0ST YVTeCDYCR3guVGbPe8RxDd9hdMR5yryiPA8O+Ezxrjgx6Grd+oSXNkddhsQw80+4zk7t a42T5Fw2Wx1sj1PG92J4FoiNJTmk7ZFQSkXccDa8TCifU/0KV1p0JW6RY0E9HL2csesJ +KJDXbdFqCIkR7jYEekt9Yo+8/SLgZOZ8FIkSfWj8b8S12aLFucTRWXpM0StBJFpo7WR gLAESEK9/EyQ6IEaPc2fRGKhrAjLBwVXt4lH2tZxknazjjFli5bvJI3XhnYl4QIEW+LW ndSA== X-Forwarded-Encrypted: i=1; AJvYcCXF7Bb4dTuDEGcZ1qig3fe1ZLODoFAG5hTdx26IeQLxigs80pEXn0D7i5H0ouQA097HPl92NI+ykJqsLaw=@vger.kernel.org X-Gm-Message-State: AOJu0YxUJiWEijkrcfoq3xLDo8V0nie/Xp34pbBKgux/MJgSq+P+ecFf +DHnt+lK/HSqPTkNbYsbc656R3j/q+M+W2DUYymoFOgtr8S1tsuhVA95c1zsF+pY2U9Cy4gybwM pJrvJIvGO11vjbIaL8T0UUg== X-Received: from wmri10-n2.prod.google.com ([2002:a05:600c:8a0a:20b0:480:690c:88de]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3ba3:b0:46e:4586:57e4 with SMTP id 5b1f17b1804b1-482db49228cmr85037865e9.24.1769866174672; Sat, 31 Jan 2026 05:29:34 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:32 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-15-vdonnefort@google.com> Subject: [PATCH v11 14/30] tracing: Add a trace remote module for testing From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a module to help testing the tracefs support for trace remotes. This module: * Use simple_ring_buffer to write into a ring-buffer. * Declare a single "selftest" event that can be triggered from user-space. * Register a "test" trace remote. This is intended to be used by trace remote selftests. Signed-off-by: Vincent Donnefort diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c index d9d8932a7b9c..43812bb7fcf8 100644 Reviewed-by: Steven Rostedt (Google) --- a/fs/tracefs/inode.c +++ b/fs/tracefs/inode.c @@ -664,6 +664,7 @@ struct dentry *tracefs_create_file(const char *name, um= ode_t mode, fsnotify_create(d_inode(dentry->d_parent), dentry); return tracefs_end_creating(dentry); } +EXPORT_SYMBOL_GPL(tracefs_create_file); =20 static struct dentry *__create_dir(const char *name, struct dentry *parent, const struct inode_operations *ops) diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index dfaf1af8862e..994d0c279060 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -1284,4 +1284,12 @@ config TRACE_REMOTE config SIMPLE_RING_BUFFER bool =20 +config TRACE_REMOTE_TEST + tristate "Test module for remote tracing" + select TRACE_REMOTE + select SIMPLE_RING_BUFFER + help + This trace remote includes a ring-buffer writer implementation using + "simple_ring_buffer". This is solely intending for testing. + endif # FTRACE diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index efe12e282f8c..9e86c43bf320 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile @@ -129,4 +129,6 @@ obj-$(CONFIG_RV) +=3D rv/ =20 obj-$(CONFIG_TRACE_REMOTE) +=3D trace_remote.o obj-$(CONFIG_SIMPLE_RING_BUFFER) +=3D simple_ring_buffer.o +obj-$(CONFIG_TRACE_REMOTE_TEST) +=3D remote_test.o + libftrace-y :=3D ftrace.o diff --git a/kernel/trace/remote_test.c b/kernel/trace/remote_test.c new file mode 100644 index 000000000000..e5023b9d2611 --- /dev/null +++ b/kernel/trace/remote_test.c @@ -0,0 +1,261 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2025 - Google LLC + * Author: Vincent Donnefort + */ + +#include +#include +#include +#include +#include + +#define REMOTE_EVENT_INCLUDE_FILE kernel/trace/remote_test_events.h +#include + +static DEFINE_PER_CPU(struct simple_rb_per_cpu *, simple_rbs); +static struct trace_buffer_desc *remote_test_buffer_desc; + +/* + * The trace_remote lock already serializes accesses from the trace_remote= _callbacks. + * However write_event can still race with load/unload. + */ +static DEFINE_MUTEX(simple_rbs_lock); + +static int remote_test_load_simple_rb(int cpu, struct ring_buffer_desc *rb= _desc) +{ + struct simple_rb_per_cpu *cpu_buffer; + struct simple_buffer_page *bpages; + int ret =3D -ENOMEM; + + cpu_buffer =3D kmalloc(sizeof(*cpu_buffer), GFP_KERNEL); + if (!cpu_buffer) + return ret; + + bpages =3D kmalloc_array(rb_desc->nr_page_va, sizeof(*bpages), GFP_KERNEL= ); + if (!bpages) + goto err_free_cpu_buffer; + + ret =3D simple_ring_buffer_init(cpu_buffer, bpages, rb_desc); + if (ret) + goto err_free_bpages; + + scoped_guard(mutex, &simple_rbs_lock) { + WARN_ON(*per_cpu_ptr(&simple_rbs, cpu)); + *per_cpu_ptr(&simple_rbs, cpu) =3D cpu_buffer; + } + + return 0; + +err_free_bpages: + kfree(bpages); + +err_free_cpu_buffer: + kfree(cpu_buffer); + + return ret; +} + +static void remote_test_unload_simple_rb(int cpu) +{ + struct simple_rb_per_cpu *cpu_buffer =3D *per_cpu_ptr(&simple_rbs, cpu); + struct simple_buffer_page *bpages; + + if (!cpu_buffer) + return; + + guard(mutex)(&simple_rbs_lock); + + bpages =3D cpu_buffer->bpages; + simple_ring_buffer_unload(cpu_buffer); + kfree(bpages); + kfree(cpu_buffer); + *per_cpu_ptr(&simple_rbs, cpu) =3D NULL; +} + +static struct trace_buffer_desc *remote_test_load(unsigned long size, void= *unused) +{ + struct ring_buffer_desc *rb_desc; + struct trace_buffer_desc *desc; + size_t desc_size; + int cpu, ret; + + if (WARN_ON(remote_test_buffer_desc)) + return ERR_PTR(-EINVAL); + + desc_size =3D trace_buffer_desc_size(size, num_possible_cpus()); + if (desc_size =3D=3D SIZE_MAX) { + ret =3D -E2BIG; + goto err; + } + + desc =3D kmalloc(desc_size, GFP_KERNEL); + if (!desc) { + ret =3D -ENOMEM; + goto err; + } + + ret =3D trace_remote_alloc_buffer(desc, desc_size, size, cpu_possible_mas= k); + if (ret) + goto err_free_desc; + + for_each_ring_buffer_desc(rb_desc, cpu, desc) { + ret =3D remote_test_load_simple_rb(rb_desc->cpu, rb_desc); + if (ret) + goto err_unload; + } + + remote_test_buffer_desc =3D desc; + + return remote_test_buffer_desc; + +err_unload: + for_each_ring_buffer_desc(rb_desc, cpu, remote_test_buffer_desc) + remote_test_unload_simple_rb(rb_desc->cpu); + trace_remote_free_buffer(remote_test_buffer_desc); + +err_free_desc: + kfree(desc); + +err: + return ERR_PTR(ret); +} + +static void remote_test_unload(struct trace_buffer_desc *desc, void *unuse= d) +{ + struct ring_buffer_desc *rb_desc; + int cpu; + + if (WARN_ON(desc !=3D remote_test_buffer_desc)) + return; + + for_each_ring_buffer_desc(rb_desc, cpu, desc) + remote_test_unload_simple_rb(rb_desc->cpu); + + remote_test_buffer_desc =3D NULL; + trace_remote_free_buffer(desc); + kfree(desc); +} + +static int remote_test_enable_tracing(bool enable, void *unused) +{ + struct ring_buffer_desc *rb_desc; + int cpu; + + if (!remote_test_buffer_desc) + return -ENODEV; + + for_each_ring_buffer_desc(rb_desc, cpu, remote_test_buffer_desc) + WARN_ON(simple_ring_buffer_enable_tracing(*per_cpu_ptr(&simple_rbs, rb_d= esc->cpu), + enable)); + return 0; +} + +static int remote_test_swap_reader_page(unsigned int cpu, void *unused) +{ + struct simple_rb_per_cpu *cpu_buffer; + + if (cpu >=3D NR_CPUS) + return -EINVAL; + + cpu_buffer =3D *per_cpu_ptr(&simple_rbs, cpu); + if (!cpu_buffer) + return -EINVAL; + + return simple_ring_buffer_swap_reader_page(cpu_buffer); +} + +static int remote_test_reset(unsigned int cpu, void *unused) +{ + struct simple_rb_per_cpu *cpu_buffer; + + if (cpu >=3D NR_CPUS) + return -EINVAL; + + cpu_buffer =3D *per_cpu_ptr(&simple_rbs, cpu); + if (!cpu_buffer) + return -EINVAL; + + return simple_ring_buffer_reset(cpu_buffer); +} + +static int remote_test_enable_event(unsigned short id, bool enable, void *= unused) +{ + if (id !=3D REMOTE_TEST_EVENT_ID) + return -EINVAL; + + /* + * Let's just use the struct remote_event enabled field that is turned on= and off by + * trace_remote. This is a bit racy but good enough for a simple test mod= ule. + */ + return 0; +} + +static ssize_t +write_event_write(struct file *filp, const char __user *ubuf, size_t cnt, = loff_t *pos) +{ + struct remote_event_format_selftest *evt_test; + struct simple_rb_per_cpu *cpu_buffer; + unsigned long val; + int ret; + + ret =3D kstrtoul_from_user(ubuf, cnt, 10, &val); + if (ret) + return ret; + + guard(mutex)(&simple_rbs_lock); + + if (!remote_event_selftest.enabled) + return -ENODEV; + + guard(preempt)(); + + cpu_buffer =3D *this_cpu_ptr(&simple_rbs); + if (!cpu_buffer) + return -ENODEV; + + evt_test =3D simple_ring_buffer_reserve(cpu_buffer, + sizeof(struct remote_event_format_selftest), + trace_clock_global()); + if (!evt_test) + return -ENODEV; + + evt_test->hdr.id =3D REMOTE_TEST_EVENT_ID; + evt_test->id =3D val; + + simple_ring_buffer_commit(cpu_buffer); + + return cnt; +} + +static const struct file_operations write_event_fops =3D { + .write =3D write_event_write, +}; + +static int remote_test_init_tracefs(struct dentry *d, void *unused) +{ + return tracefs_create_file("write_event", 0200, d, NULL, &write_event_fop= s) ? + 0 : -ENOMEM; +} + +static struct trace_remote_callbacks trace_remote_callbacks =3D { + .init =3D remote_test_init_tracefs, + .load_trace_buffer =3D remote_test_load, + .unload_trace_buffer =3D remote_test_unload, + .enable_tracing =3D remote_test_enable_tracing, + .swap_reader_page =3D remote_test_swap_reader_page, + .reset =3D remote_test_reset, + .enable_event =3D remote_test_enable_event, +}; + +static int __init remote_test_init(void) +{ + return trace_remote_register("test", &trace_remote_callbacks, NULL, + &remote_event_selftest, 1); +} + +module_init(remote_test_init); + +MODULE_DESCRIPTION("Test module for the trace remote interface"); +MODULE_AUTHOR("Vincent Donnefort"); +MODULE_LICENSE("GPL"); diff --git a/kernel/trace/remote_test_events.h b/kernel/trace/remote_test_e= vents.h new file mode 100644 index 000000000000..26b93b3406fc --- /dev/null +++ b/kernel/trace/remote_test_events.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#define REMOTE_TEST_EVENT_ID 1 + +REMOTE_EVENT(selftest, REMOTE_TEST_EVENT_ID, + RE_STRUCT( + re_field(u64, id) + ), + RE_PRINTK("id=3D%llu", __entry->id) +); --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 D3B78353EE4 for ; Sat, 31 Jan 2026 13:29:36 +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=1769866180; cv=none; b=C30/PIaCh6nJnXPzBbj70eJXwUnXLZ/f3AdUuapnZhdyBYom12NewWteVt8g50bUPcHfXWbyiD+gDVsjwoGwW8W1tFH+Uu9zGA6oJW+yEhVh4ouIGxk08TBN7YKRe/8MeuDq08uAG1pZ8TuYC+GqrREE3yVZ8VRou9kEiDmnIPI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866180; c=relaxed/simple; bh=7Z5QRo7r123/HcFL/mfDtGCpCIJ6dBLjK9N9cR+Lckg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=tBPlzPNYH+XyZrSDGHseUh8zlMV/7SQiP489dQt9/IsuZjufPotRG/j8n3ITHipNp2dVNa4CG+2nPRLA8irV1bXMOmDfZp6Daf+kd7pmySqGaBlFHFrt7CFNhQTpq3J39oEUz954uCybluMHPJMoHhhJ2mReqj4gVBNt2yPQAio= 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=XiZfxKCX; 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="XiZfxKCX" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-47ee3dd7fc8so31046745e9.3 for ; Sat, 31 Jan 2026 05:29:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866175; x=1770470975; 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=A2Flna33JbpcPYzR1RnQCAboR6p6dWaBBSPypFzn9Is=; b=XiZfxKCXWxRL9AwzSbiiKmkIXxJAMmAXvKWjQNARy2Ks22/YOxC03YQHmmHPSO9qqc IInQfM4LiB4mVw1/elsVwOpDZP/NZT3hx4GrT4EfewiYSZQOhT2cD62MKDAM3BiGaUAE bbjr+KOZaCvlKvn/dXKmTfce3tCSfNgyWzvdkjQ9WGdBNWBobs8k0KZOji4zUTFefajh y8HbtKKouuhkn1VD/4QiSBjmOBh4ZswQUfL5yraA1F3h/Bjmo201ru2fwBFIPPC8D9M9 XThhcA1Dw077B5Wm8jhCusd5Nrgjtsu1Ve+bQl2jLivOcy9jXizP5NYwx73m4BQS53tR YXTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866175; x=1770470975; 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=A2Flna33JbpcPYzR1RnQCAboR6p6dWaBBSPypFzn9Is=; b=NxTXlZGD+iJ8IKbbYwLbSdRGQIS9mBUOsluQjvOSSnHlIqGj+CiAMUvBtsUNB3Dh2U Sw9PCVkMmho9WEb8jyxWc8yhJMqk5JYrH6pCBv8y8V94zJmWaH6tgk+qiHUA2XI2oitZ KRYX07sTtPr47KPOOQNDlufmCQF5sUsdI2vke9agAVQSK9L6NZvanvVGD0xM1ZYliFEX 1NJYoNVADDM/s3HmfJmjSB0c3Q/A86aPO5Wokw2pI/WJrVnt+wH171bAEeEg1Y6AWwkz pFj9CUI4biRGH0aGvGHrPgZQbV++57O6h5AvRGu1hshNrxsspdrwuPRfS/zHUOJWbZAh 8LnA== X-Forwarded-Encrypted: i=1; AJvYcCUbr6483OPmBhESHShV/5tAE7Cl+MqhPb/3q8d9cNSBXOG+zoKexExEneUtsCVzaUSoCZ6NSp3SgYbtKXI=@vger.kernel.org X-Gm-Message-State: AOJu0YyTPRdWt4rMy/PmB5TaiJhRENEVbExCK93SFccKO+nKBPt7Rvtr MSCF6/Ai6nv0jMcWjICkxZXy5LThrvlVlm2NU2T6nvJwY3ppTvbw54Xq7hApb44Bx3FSwDuRCP8 yOnEen+FaZfhuGMx1g60kqQ== X-Received: from wmi12.prod.google.com ([2002:a05:600c:20c:b0:480:5726:478a]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:a00d:b0:47a:814c:ee95 with SMTP id 5b1f17b1804b1-482db465540mr70367195e9.12.1769866175432; Sat, 31 Jan 2026 05:29:35 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:33 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-16-vdonnefort@google.com> Subject: [PATCH v11 15/30] tracing: selftests: Add trace remote tests From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort , Shuah Khan , linux-kselftest@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Exercise the tracefs interface for trace remote with a set of tests to check: * loading/unloading (unloading.tc) * reset (reset.tc) * size changes (buffer_size.tc) * consuming read (trace_pipe.tc) * non-consuming read (trace.tc) Cc: Shuah Khan Cc: linux-kselftest@vger.kernel.org Signed-off-by: Vincent Donnefort diff --git a/tools/testing/selftests/ftrace/test.d/remotes/buffer_size.tc b= /tools/testing/selftests/ftrace/test.d/remotes/buffer_size.tc new file mode 100644 index 000000000000..1a43280ffa97 --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/remotes/buffer_size.tc @@ -0,0 +1,25 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test trace remote buffer size +# requires: remotes/test + +. $TEST_DIR/remotes/functions + +test_buffer_size() +{ + echo 0 > tracing_on + assert_unloaded + + echo 4096 > buffer_size_kb + echo 1 > tracing_on + assert_loaded + + echo 0 > tracing_on + echo 7 > buffer_size_kb +} + +if [ -z "$SOURCE_REMOTE_TEST" ]; then + set -e + setup_remote_test + test_buffer_size +fi diff --git a/tools/testing/selftests/ftrace/test.d/remotes/functions b/tool= s/testing/selftests/ftrace/test.d/remotes/functions new file mode 100644 index 000000000000..97a09d564a34 --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/remotes/functions @@ -0,0 +1,88 @@ +# SPDX-License-Identifier: GPL-2.0 + +setup_remote() +{ + local name=3D$1 + + [ -e $TRACING_DIR/remotes/$name/write_event ] || exit_unresolved + + cd remotes/$name/ + echo 0 > tracing_on + clear_trace + echo 7 > buffer_size_kb + echo 0 > events/enable + echo 1 > events/$name/selftest/enable + echo 1 > tracing_on +} + +setup_remote_test() +{ + [ -d $TRACING_DIR/remotes/test/ ] || modprobe remote_test || exit_unresol= ved + + setup_remote "test" +} + +assert_loaded() +{ + grep -q "(loaded)" buffer_size_kb +} + +assert_unloaded() +{ + grep -q "(unloaded)" buffer_size_kb +} + +dump_trace_pipe() +{ + output=3D$(mktemp $TMPDIR/remote_test.XXXXXX) + cat trace_pipe > $output & + pid=3D$! + sleep 1 + kill -1 $pid + + echo $output +} + +check_trace() +{ + start_id=3D"$1" + end_id=3D"$2" + file=3D"$3" + + # Ensure the file is not empty + test -n "$(head $file)" + + prev_ts=3D0 + id=3D0 + + # Only keep + tmp=3D$(mktemp $TMPDIR/remote_test.XXXXXX) + sed -e 's/\[[0-9]*\]\s*\([0-9]*.[0-9]*\): [a-z]* id=3D\([0-9]*\)/\1 \2/' = $file > $tmp + + while IFS=3D read -r line; do + ts=3D$(echo $line | cut -d ' ' -f 1) + id=3D$(echo $line | cut -d ' ' -f 2) + + test $(echo "$ts>$prev_ts" | bc) -eq 1 + test $id -eq $start_id + + prev_ts=3D$ts + start_id=3D$((start_id + 1)) + done < $tmp + + test $id -eq $end_id + rm $tmp +} + +get_cpu_ids() +{ + sed -n 's/^processor\s*:\s*\([0-9]\+\).*/\1/p' /proc/cpuinfo +} + +get_page_size() { + sed -ne 's/^.*data.*size:\([0-9][0-9]*\).*/\1/p' events/header_page +} + +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/reset.tc b/tools= /testing/selftests/ftrace/test.d/remotes/reset.tc new file mode 100644 index 000000000000..4d176349b2bc --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/remotes/reset.tc @@ -0,0 +1,90 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test trace remote reset +# requires: remotes/test + +. $TEST_DIR/remotes/functions + +check_reset() +{ + write_event_path=3D"write_event" + taskset=3D"" + + clear_trace + + # Is the buffer empty? + output=3D$(dump_trace_pipe) + test $(wc -l $output | cut -d ' ' -f1) -eq 0 + + if $(echo $(pwd) | grep -q "per_cpu/cpu"); then + write_event_path=3D"../../write_event" + cpu_id=3D$(echo $(pwd) | sed -e 's/.*per_cpu\/cpu//') + taskset=3D"taskset -c $cpu_id" + fi + rm $output + + # Can we properly write a new event? + $taskset echo 7890 > $write_event_path + output=3D$(dump_trace_pipe) + test $(wc -l $output | cut -d ' ' -f1) -eq 1 + grep -q "id=3D7890" $output + rm $output +} + +test_global_interface() +{ + output=3D$(mktemp $TMPDIR/remote_test.XXXXXX) + + # Confidence check + echo 123456 > write_event + output=3D$(dump_trace_pipe) + grep -q "id=3D123456" $output + rm $output + + # Reset single event + echo 1 > write_event + check_reset + + # Reset lost events + for i in $(seq 1 10000); do + echo 1 > write_event + done + check_reset +} + +test_percpu_interface() +{ + [ "$(get_cpu_ids | wc -l)" -ge 2 ] || return 0 + + for cpu in $(get_cpu_ids); do + taskset -c $cpu echo 1 > write_event + done + + check_non_empty=3D0 + for cpu in $(get_cpu_ids); do + cd per_cpu/cpu$cpu/ + + if [ $check_non_empty -eq 0 ]; then + check_reset + check_non_empty=3D1 + else + # Check we have only reset 1 CPU + output=3D$(dump_trace_pipe) + test $(wc -l $output | cut -d ' ' -f1) -eq 1 + rm $output + fi + cd - + done +} + +test_reset() +{ + test_global_interface + test_percpu_interface +} + +if [ -z "$SOURCE_REMOTE_TEST" ]; then + set -e + setup_remote_test + test_reset +fi diff --git a/tools/testing/selftests/ftrace/test.d/remotes/trace.tc b/tools= /testing/selftests/ftrace/test.d/remotes/trace.tc new file mode 100644 index 000000000000..170f7648732a --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/remotes/trace.tc @@ -0,0 +1,127 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test trace remote non-consuming read +# requires: remotes/test + +. $TEST_DIR/remotes/functions + +test_trace() +{ + echo 0 > tracing_on + assert_unloaded + + echo 7 > buffer_size_kb + echo 1 > tracing_on + assert_loaded + + # Simple test: Emit few events and try to read them + for i in $(seq 1 8); do + echo $i > write_event + done + + check_trace 1 8 trace + + # + # Test interaction with consuming read + # + + cat trace_pipe > /dev/null & + pid=3D$! + + sleep 1 + kill $pid + + test $(wc -l < trace) -eq 0 + + for i in $(seq 16 32); do + echo $i > write_event + done + + check_trace 16 32 trace + + # + # Test interaction with reset + # + + echo 0 > trace + + test $(wc -l < trace) -eq 0 + + for i in $(seq 1 8); do + echo $i > write_event + done + + check_trace 1 8 trace + + # + # Test interaction with lost events + # + + # 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 + + # Ensure ring-buffer overflow by emitting events from the same CPU + for cpu in $(get_cpu_ids); do + break + done + + events_per_page=3D$(($(get_page_size) / $(get_selftest_event_size))) #= Approx: does not take TS into account + nr_events=3D$(($events_per_page * 2)) + for i in $(seq 1 $nr_events); do + taskset -c $cpu echo $i > write_event + done + + id=3D$(sed -n -e '1s/\[[0-9]*\]\s*[0-9]*.[0-9]*: [a-z]* id=3D\([0-9]*\= )/\1/p' trace) + test $id -ne 1 + + check_trace $id $nr_events trace + + # + # Test per-CPU interface + # + echo 0 > trace + + for cpu in $(get_cpu_ids) ; do + taskset -c $cpu echo $cpu > write_event + done + + for cpu in $(get_cpu_ids); do + cd per_cpu/cpu$cpu/ + + check_trace $cpu $cpu trace + + 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 +} + +if [ -z "$SOURCE_REMOTE_TEST" ]; then + set -e + + setup_remote_test + test_trace +fi diff --git a/tools/testing/selftests/ftrace/test.d/remotes/trace_pipe.tc b/= tools/testing/selftests/ftrace/test.d/remotes/trace_pipe.tc new file mode 100644 index 000000000000..669a7288ed7c --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/remotes/trace_pipe.tc @@ -0,0 +1,127 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test trace remote consuming read +# requires: remotes/test + +. $TEST_DIR/remotes/functions + +test_trace_pipe() +{ + echo 0 > tracing_on + assert_unloaded + + # Emit events from the same CPU + for cpu in $(get_cpu_ids); do + break + done + + # + # Simple test: Emit enough events to fill few pages + # + + echo 1024 > buffer_size_kb + echo 1 > tracing_on + assert_loaded + + events_per_page=3D$(($(get_page_size) / $(get_selftest_event_size))) + nr_events=3D$(($events_per_page * 4)) + + output=3D$(mktemp $TMPDIR/remote_test.XXXXXX) + + cat trace_pipe > $output & + pid=3D$! + + for i in $(seq 1 $nr_events); do + taskset -c $cpu echo $i > write_event + done + + echo 0 > tracing_on + sleep 1 + kill $pid + + check_trace 1 $nr_events $output + + rm $output + + # + # Test interaction with lost events + # + + assert_unloaded + echo 7 > buffer_size_kb + echo 1 > tracing_on + assert_loaded + + nr_events=3D$((events_per_page * 2)) + for i in $(seq 1 $nr_events); do + taskset -c $cpu echo $i > write_event + done + + output=3D$(dump_trace_pipe) + + lost_events=3D$(sed -n -e '1s/CPU:.*\[LOST \([0-9]*\) EVENTS\]/\1/p' $= output) + test -n "$lost_events" + + id=3D$(sed -n -e '2s/\[[0-9]*\]\s*[0-9]*.[0-9]*: [a-z]* id=3D\([0-9]*\= )/\1/p' $output) + test "$id" -eq $(($lost_events + 1)) + + # Drop [LOST EVENTS] line + sed -i '1d' $output + + check_trace $id $nr_events $output + + rm $output + + # + # Test per-CPU interface + # + + echo 0 > trace + echo 1 > tracing_on + + for cpu in $(get_cpu_ids); do + taskset -c $cpu echo $cpu > write_event + done + + for cpu in $(get_cpu_ids); do + cd per_cpu/cpu$cpu/ + output=3D$(dump_trace_pipe) + + check_trace $cpu $cpu $output + + 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 +} + +if [ -z "$SOURCE_REMOTE_TEST" ]; then + set -e + + setup_remote_test + test_trace_pipe +fi diff --git a/tools/testing/selftests/ftrace/test.d/remotes/unloading.tc b/t= ools/testing/selftests/ftrace/test.d/remotes/unloading.tc new file mode 100644 index 000000000000..cac2190183f6 --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/remotes/unloading.tc @@ -0,0 +1,41 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test trace remote unloading +# requires: remotes/test + +. $TEST_DIR/remotes/functions + +test_unloading() +{ + # No reader, writing + assert_loaded + + # No reader, no writing + echo 0 > tracing_on + assert_unloaded + + # 1 reader, no writing + cat trace_pipe & + pid=3D$! + sleep 1 + assert_loaded + kill $pid + assert_unloaded + + # No reader, no writing, events + echo 1 > tracing_on + echo 1 > write_event + echo 0 > tracing_on + assert_loaded + + # Test reset + clear_trace + assert_unloaded +} + +if [ -z "$SOURCE_REMOTE_TEST" ]; then + set -e + + setup_remote_test + test_unloading +fi --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 EF19A353ECE for ; Sat, 31 Jan 2026 13:29:37 +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=1769866180; cv=none; b=jYivsDlZffm6GXolj6q5kWA1tXOLTYGTFpmbpv6pdoMogqFaakA7z06XM/ztP6OI0aBdV22+o2iZ6TSc/A8N0dmZhPzBWrpRx6T9HyQmBc64Pp8EKkT7GFj3HkaMxlQpleeToLTQjM4qNCMSURM4+hMuHbnfkEO+dhmVD8v9tDU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866180; c=relaxed/simple; bh=KqGQJ3tC3qFnZ/Dn8gtyeUO3Ghwgazfb45Eed7HGhOY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=pjkybcKaJ+X66FuoCFWCp6SFdOxI8PgnM2XcGSf7DM1SSR2V7SmoQjr2g3qgMfBI8VAS9/EFRnYkqHYOYjGBknvJTavOZdX4PqTN3IbaYnUNThw3r1TGpUQO70ABAqvTn/MubZkh2ef8iH3zJcvMQ4Am352B/BglopzcdGyLzrc= 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=pQE3I+GP; 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="pQE3I+GP" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-47edfdc6c1aso23383865e9.3 for ; Sat, 31 Jan 2026 05:29:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866176; x=1770470976; 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=t7Sypasz+bQGyNEk8DfMJjS2f0ZOWyjNay6SOTdco7o=; b=pQE3I+GPEVKRocsRYapeMXi1UdFDBIPGYw7PLdrcZ/UnRaa97Spl3Sxe/Q1r7JldEe alv4vxh5CRuV0tZRQ+uwWBnWkMErEmslxHkqWF7uTLgGIs6HeP46NJkkI3mhenJYHRvH Yx8IErAzdHGJvbtjp2e45ZxbN44C4vX0pijKImmrCrwsZvHQyzRppGHOXbPvzeTJ5nt0 k9/C2Z3cS7Zg/fagIeO074CHQ+QNsmAC8uVE6kCMz6uhZBxC/xbQn9dBlGn0/vJoyedj IKakkh6vezqgE2KVPacj3k8yq0WF+BFT0AgSK6i1b41U55QPqQ+7u6n+D3XbljrLBFFb hKDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866176; x=1770470976; 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=t7Sypasz+bQGyNEk8DfMJjS2f0ZOWyjNay6SOTdco7o=; b=WhjvXYrzA+B2/DCe+7tlNYgMKYwDPueYTNi3naTIFBylZD77Ae7hmn78dN1Se8QlNV j7GSGOHUNRqZEK6jKCmPyhw0OtzWhOcp77TFAmXrbj4OZvLy62OztCetga4xsqAqzm0+ zv7hrlSWKrlGaHylNTqc2gIZ3zDbAY7LUlZLyWFTIT1QWsMlX0L5Gun1WCJh8hnGUy2+ hkl82/GjChZRzg03i+0H++bCATZz8Dsg4mwqIbJZN2Z7acEKv6XqQkfRAD8x6mMNDrN6 COFm4vo0FA6WcAGjNTK1LNuMNMHq2z63t70cNdJUTvgPh7YT+bAB21OxSEglFQjGhVh0 YsaQ== X-Forwarded-Encrypted: i=1; AJvYcCWmcNe02UOVUsOy3BqXOq8AJodOjiqA07V7f0IhWUOQih+uVMlHV8xPDkXdfWudfZ+8J4Za3ayphDD5lDA=@vger.kernel.org X-Gm-Message-State: AOJu0YxAPmIkCBh5TZqpOC3J677bpAdgWlJw/bQDiIdNIPzALFOiJS04 Gxme3q62aJsUxPtMka2VXY3K4TnOHrVwlYOy6SRZ4V8Npq3C3qZkAszggUwykvolxyTsaUCkQuX k1vXQwo2BbWnJ0xu7oc1nDg== X-Received: from wmot11.prod.google.com ([2002:a05:600c:450b:b0:480:6ccb:80fd]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:34cd:b0:480:1a3a:5ce6 with SMTP id 5b1f17b1804b1-482db46b665mr66755355e9.14.1769866176467; Sat, 31 Jan 2026 05:29:36 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:34 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-17-vdonnefort@google.com> Subject: [PATCH v11 16/30] Documentation: tracing: Add tracing remotes From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add documentation about the newly introduced tracing remotes framework. Signed-off-by: Vincent Donnefort diff --git a/Documentation/trace/index.rst b/Documentation/trace/index.rst index b4a429dc4f7a..d77ffb7e2d08 100644 Reviewed-by: Steven Rostedt (Google) --- a/Documentation/trace/index.rst +++ b/Documentation/trace/index.rst @@ -90,6 +90,17 @@ interactions. user_events uprobetracer =20 +Remote Tracing +-------------- + +This section covers the framework to read compatible ring-buffers, written= by +entities outside of the kernel (most likely firmware or hypervisor) + +.. toctree:: + :maxdepth: 1 + + remotes + Additional Resources -------------------- =20 diff --git a/Documentation/trace/remotes.rst b/Documentation/trace/remotes.= rst new file mode 100644 index 000000000000..1f9d764f69aa --- /dev/null +++ b/Documentation/trace/remotes.rst @@ -0,0 +1,66 @@ +.. SPDX-License-Identifier: GPL-2.0 + +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +Tracing Remotes +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +:Author: Vincent Donnefort + +Overview +=3D=3D=3D=3D=3D=3D=3D=3D +Firmware and hypervisors are black boxes to the kernel. Having a way to se= e what +they are doing can be useful to debug both. This is where remote tracing b= uffers +come in. A remote tracing buffer is a ring buffer executed by the firmware= or +hypervisor into memory that is memory mapped to the host kernel. This is s= imilar +to how user space memory maps the kernel ring buffer but in this case the = kernel +is acting like user space and the firmware or hypervisor is the "kernel" s= ide. +With a trace remote ring buffer, the firmware and hypervisor can record ev= ents +for which the host kernel can see and expose to user space. + +Register a remote +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +A remote must provide a set of callbacks `struct trace_remote_callbacks` w= hom +description can be found below. Those callbacks allows Tracefs to enable a= nd +disable tracing and events, to load and unload a tracing buffer (a set of +ring-buffers) and to swap a reader page with the head page, which enables +consuming reading. + +.. kernel-doc:: include/linux/trace_remote.h + +Once registered, an instance will appear for this remote in the Tracefs +directory **remotes/**. Buffers can then be read using the usual Tracefs f= iles +**trace_pipe** and **trace**. + +Declare a remote event +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +Macros are provided to ease the declaration of remote events, in a similar +fashion to in-kernel events. A declaration must provide an ID, a descripti= on of +the event arguments and how to print the event: + +.. code-block:: c + + REMOTE_EVENT(foo, EVENT_FOO_ID, + RE_STRUCT( + re_field(u64, bar) + ), + RE_PRINTK("bar=3D%lld", __entry->bar) + ); + +Then those events must be declared in a C file with the following: + +.. code-block:: c + + #define REMOTE_EVENT_INCLUDE_FILE foo_events.h + #include + +This will provide a `struct remote_event remote_event_foo` that can be giv= en to +`trace_remote_register`. + +Registered events appear in the remote directory under **events/**. + +Simple ring-buffer +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +A simple implementation for a ring-buffer writer can be found in +kernel/trace/simple_ring_buffer.c. + +.. kernel-doc:: include/linux/simple_ring_buffer.h --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 2026 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.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 07FB33587B0 for ; Sat, 31 Jan 2026 13:29:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866183; cv=none; b=G4BpJQtFGQWbBXaPrHVnpKlZykid+kVsd9AYbJSOZjeAs5HI9qp9vH1pptW92IRmbISnegiXWD5TrqgQEVz3cMV+BBsU0g0t4bTZmNsN0C9DZnUO/BA2UnxJ6GUMrdEi15+Qn4QjXPqbOPCQk+wrM4IpOAM1m9ZBoJewAvEGXkI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866183; c=relaxed/simple; bh=Sxuqk4VZ6qANkzLXQvZSMabSZh60GttBUsq4LMXjS1E=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=efHR/ls3J8PSaC+t9uM0LIv1lIfaE69FX1cmCITbdnRVyBmwq+2uX9jBzmDttJzbJMwO6h0l5J3N+IYjjZSjCIzs4n/V3jmohhhhSWU4LUH5q4Uu242tHY8u6+VxPVjJRS0z8PLJOlgErC7OJGZPPLZ9YxDbCLwions33LIIrfE= 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=V2nslo7t; arc=none smtp.client-ip=209.85.221.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="V2nslo7t" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-4325b182e3cso1998617f8f.2 for ; Sat, 31 Jan 2026 05:29:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866177; x=1770470977; 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=g1mZ+ZNkONBjyfcjUN3hF7cGlkHOrtSmM6+OwF5eQuA=; b=V2nslo7t1iXCqDj+kqE0eNseZ7KuhitQtpCr/P9oKvTUqx2/9PIhwbV2CsEzGZEYGp 6Sq3hzTiMhcbWa531IuHNKk/gYjp/MogdFK5bJBxaLfFgC09OI12y+yDeaHF1Owjq7CA V4TzjD4CkVHTZUV4W2AQZ2DV8STi6h5wjUgSRROfaZbTTLFIlJo6JqPReD0Li3lDD/GF saBd0I4cPUP3IvBanGRHKA4guXxqS7LBlJCMAlXZobAM6fM/BKePFAuoqe2z0I6kU+i7 rhujp2n8Bi0oVsvo6l5UHabxwyypvcbETzPrU2qU0Rpm53JZ0wR5fdoOvOiwmQd8kJMO dX3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866177; x=1770470977; 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=g1mZ+ZNkONBjyfcjUN3hF7cGlkHOrtSmM6+OwF5eQuA=; b=wFBuCuahkJyOzCPqMpyNMugeV+/lfMy7v9OfOKhyL/57jvgsdf7GAapju4eaUmAZob un/4l0w1C2iy4+KlWpsI1b2uWXeGiHSZl9W6d2ciHQMtrF/IvJ1LzK6xF+hdHPI+CG/R byxNIWgBMeHmZSEatMyHlq2aY8dUDUjiSPv2Z+JCCu92zpSXas3nq+tgNwOABWk9mefu r0DWnGgLsg97F8dO15Ctqith1SNX5ouWZjQeMh9i504ZvHqYIGqXGU1IOcBg96eujbDG Un8O9B6RLu6gOwF04g9CUIeWMV99Tu6ABl+++XpdZawWigiTlxPVC3v891e6m+jJ1YmR 7iig== X-Forwarded-Encrypted: i=1; AJvYcCWBo0R7d7tN1Qf9LaZ6f+kjez2Z8PBXMPjUX1R1tH+vXprv3t7wyHA1GfKFZffDXw99YGHZe738+2PYuog=@vger.kernel.org X-Gm-Message-State: AOJu0YyhhZE5YRGm0Tyzk1YxzwO00aDnTKWqUMCpjqxMumyLRoqaNRAC R0fQDStYtPUMnD2gb6Nl6N8oxizy4Aedvip7KKJW8ptDtecTTCthFqOr8JQ6DeehVYqCHcEZ8fk JEP3FZJfxBpJZpqeB01gVCQ== X-Received: from wrbek14.prod.google.com ([2002:a05:6000:220e:b0:435:f777:d162]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:3103:b0:435:dbbe:1130 with SMTP id ffacd0b85a97d-435f3a6ca95mr9449773f8f.11.1769866177281; Sat, 31 Jan 2026 05:29:37 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:35 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-18-vdonnefort@google.com> Subject: [PATCH v11 17/30] tracing: load/unload page callbacks for simple_ring_buffer From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add load/unload callback used for each admitted page in the ring-buffer. This will be later useful for the pKVM hypervisor which uses a different VA space and need to dynamically map/unmap the ring-buffer pages. Signed-off-by: Vincent Donnefort diff --git a/include/linux/simple_ring_buffer.h b/include/linux/simple_ring= _buffer.h index 2c4c0ae336bc..21aec556293e 100644 Reviewed-by: Steven Rostedt (Google) --- a/include/linux/simple_ring_buffer.h +++ b/include/linux/simple_ring_buffer.h @@ -54,4 +54,12 @@ int simple_ring_buffer_reset(struct simple_rb_per_cpu *c= pu_buffer); =20 int simple_ring_buffer_swap_reader_page(struct simple_rb_per_cpu *cpu_buff= er); =20 +int simple_ring_buffer_init_mm(struct simple_rb_per_cpu *cpu_buffer, + struct simple_buffer_page *bpages, + const struct ring_buffer_desc *desc, + void *(*load_page)(unsigned long va), + void (*unload_page)(void *va)); + +void simple_ring_buffer_unload_mm(struct simple_rb_per_cpu *cpu_buffer, + void (*unload_page)(void *)); #endif diff --git a/kernel/trace/simple_ring_buffer.c b/kernel/trace/simple_ring_b= uffer.c index 88afd28ffef7..2adfeb5a8f4d 100644 --- a/kernel/trace/simple_ring_buffer.c +++ b/kernel/trace/simple_ring_buffer.c @@ -71,7 +71,7 @@ static void simple_bpage_reset(struct simple_buffer_page = *bpage) local_set(&bpage->page->commit, 0); } =20 -static void simple_bpage_init(struct simple_buffer_page *bpage, unsigned l= ong page) +static void simple_bpage_init(struct simple_buffer_page *bpage, void *page) { INIT_LIST_HEAD(&bpage->link); bpage->page =3D (struct buffer_data_page *)page; @@ -376,19 +376,15 @@ int simple_ring_buffer_reset(struct simple_rb_per_cpu= *cpu_buffer) } EXPORT_SYMBOL_GPL(simple_ring_buffer_reset); =20 -/** - * simple_ring_buffer_init - Init @cpu_buffer based on @desc - * - * @cpu_buffer: A simple_rb_per_cpu buffer to init, allocated by the calle= r. - * @bpages: Array of simple_buffer_pages, with as many elements as @desc->= nr_page_va - * @desc: A ring_buffer_desc - * - * Returns: 0 on success or -EINVAL if the content of @desc is invalid - */ -int simple_ring_buffer_init(struct simple_rb_per_cpu *cpu_buffer, struct s= imple_buffer_page *bpages, - const struct ring_buffer_desc *desc) +int simple_ring_buffer_init_mm(struct simple_rb_per_cpu *cpu_buffer, + struct simple_buffer_page *bpages, + const struct ring_buffer_desc *desc, + void *(*load_page)(unsigned long va), + void (*unload_page)(void *va)) { struct simple_buffer_page *bpage =3D bpages; + int ret =3D 0; + void *page; int i; =20 /* At least 1 reader page and two pages in the ring-buffer */ @@ -397,15 +393,22 @@ int simple_ring_buffer_init(struct simple_rb_per_cpu = *cpu_buffer, struct simple_ =20 memset(cpu_buffer, 0, sizeof(*cpu_buffer)); =20 - cpu_buffer->bpages =3D bpages; + cpu_buffer->meta =3D load_page(desc->meta_va); + if (!cpu_buffer->meta) + return -EINVAL; =20 - cpu_buffer->meta =3D (void *)desc->meta_va; memset(cpu_buffer->meta, 0, sizeof(*cpu_buffer->meta)); cpu_buffer->meta->meta_page_size =3D PAGE_SIZE; cpu_buffer->meta->nr_subbufs =3D cpu_buffer->nr_pages; =20 /* The reader page is not part of the ring initially */ - simple_bpage_init(bpage, desc->page_va[0]); + page =3D load_page(desc->page_va[0]); + if (!page) { + unload_page(cpu_buffer->meta); + return -EINVAL; + } + + simple_bpage_init(bpage, page); bpage->id =3D 0; =20 cpu_buffer->nr_pages =3D 1; @@ -415,7 +418,13 @@ int simple_ring_buffer_init(struct simple_rb_per_cpu *= cpu_buffer, struct simple_ cpu_buffer->head_page =3D bpage + 1; =20 for (i =3D 1; i < desc->nr_page_va; i++) { - simple_bpage_init(++bpage, desc->page_va[i]); + page =3D load_page(desc->page_va[i]); + if (!page) { + ret =3D -EINVAL; + break; + } + + simple_bpage_init(++bpage, page); =20 bpage->link.next =3D &(bpage + 1)->link; bpage->link.prev =3D &(bpage - 1)->link; @@ -424,6 +433,14 @@ int simple_ring_buffer_init(struct simple_rb_per_cpu *= cpu_buffer, struct simple_ cpu_buffer->nr_pages =3D i + 1; } =20 + if (ret) { + for (i--; i >=3D 0; i--) + unload_page((void *)desc->page_va[i]); + unload_page(cpu_buffer->meta); + + return ret; + } + /* Close the ring */ bpage->link.next =3D &cpu_buffer->tail_page->link; cpu_buffer->tail_page->link.prev =3D &bpage->link; @@ -431,25 +448,50 @@ int simple_ring_buffer_init(struct simple_rb_per_cpu = *cpu_buffer, struct simple_ /* The last init'ed page points to the head page */ simple_bpage_set_head_link(bpage); =20 + cpu_buffer->bpages =3D bpages; + return 0; } -EXPORT_SYMBOL_GPL(simple_ring_buffer_init); + +static void *__load_page(unsigned long page) +{ + return (void *)page; +} + +static void __unload_page(void *page) { } =20 /** - * simple_ring_buffer_unload - Prepare @cpu_buffer for deletion + * simple_ring_buffer_init - Init @cpu_buffer based on @desc * - * @cpu_buffer: A simple_rb_per_cpu that will be deleted. + * @cpu_buffer: A simple_rb_per_cpu buffer to init, allocated by the calle= r. + * @bpages: Array of simple_buffer_pages, with as many elements as @desc->= nr_page_va + * @desc: A ring_buffer_desc + * + * Returns: 0 on success or -EINVAL if the content of @desc is invalid */ -void simple_ring_buffer_unload(struct simple_rb_per_cpu *cpu_buffer) +int simple_ring_buffer_init(struct simple_rb_per_cpu *cpu_buffer, struct s= imple_buffer_page *bpages, + const struct ring_buffer_desc *desc) { + return simple_ring_buffer_init_mm(cpu_buffer, bpages, desc, __load_page, = __unload_page); +} +EXPORT_SYMBOL_GPL(simple_ring_buffer_init); + +void simple_ring_buffer_unload_mm(struct simple_rb_per_cpu *cpu_buffer, + void (*unload_page)(void *)) +{ + int p; + if (!simple_rb_loaded(cpu_buffer)) return; =20 simple_rb_enable_tracing(cpu_buffer, false); =20 + unload_page(cpu_buffer->meta); + for (p =3D 0; p < cpu_buffer->nr_pages; p++) + unload_page(cpu_buffer->bpages[p].page); + cpu_buffer->bpages =3D NULL; } -EXPORT_SYMBOL_GPL(simple_ring_buffer_unload); =20 /** * simple_ring_buffer_enable_tracing - Enable or disable writing to @cpu_b= uffer @@ -459,6 +501,12 @@ EXPORT_SYMBOL_GPL(simple_ring_buffer_unload); * * Returns 0 on success or -ENODEV if @cpu_buffer was unloaded */ +void simple_ring_buffer_unload(struct simple_rb_per_cpu *cpu_buffer) +{ + return simple_ring_buffer_unload_mm(cpu_buffer, __unload_page); +} +EXPORT_SYMBOL_GPL(simple_ring_buffer_unload); + int simple_ring_buffer_enable_tracing(struct simple_rb_per_cpu *cpu_buffer= , bool enable) { if (!simple_rb_loaded(cpu_buffer)) --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 B3163357704 for ; Sat, 31 Jan 2026 13:29:39 +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=1769866182; cv=none; b=fMcP3g8lu/h9jcCqrdWXeRyCD9R6Cq5+ybKVEVT8THtm77XwkB7WCyqBuw07Qp42dBkcT5/6oMNhlmw3uE+gCW7H4wVENeEUZcTw3hWAkO1QcHiHQF3jpx4SNYzwY80O+lk0xyCtHHHCZsPmhhranvSkyWVxaZaL8gV1pqo2u2I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866182; c=relaxed/simple; bh=GbGuivigEnOxXZ6AzKbFEuI6H/bL1pwWbx0et86tPxQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=pLmlBZ2qMgeFMVZap+iSErfHRZsEQ0u+nd8Pf+jiUxWDDRzyxs2bojkwImqphDOwsnIlKg6n/5RRnyqmNgY9m4IESgWrai0ND4do/yi2lzy4QuQEVjg7UnNqQLTF4yIBsndMMKW9ajKx6lyA9eN5dj7G1VFoPq8zThpSJPfmGTg= 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=NGs8el4u; 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="NGs8el4u" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-477c49f273fso27863475e9.3 for ; Sat, 31 Jan 2026 05:29:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866178; x=1770470978; 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=TvedzD7+kJrfpkXnSgvR+lwDnj1DXH1BG+s75ebhGeM=; b=NGs8el4u5nUTFHUFMD1//Sa6CNGSNfuiqFxSWU3K5O0Ky3YONwrnZigs4+uSG923kY 4zu0XYXB90l7/6NPARA1II0fWOfVtZw2kkz9bsP8DzRSxif7hA3K68qhWK+kfLp9SO3Q Qo3Vstn3NPUu2o0mT6+zJYAu19JaNPuFaBjGd/3VyjTrf9nYz0SCvTlFVD/LNiNCremQ O8sK00Lk3gH9lk/6EIbq3Ky1/1EP8lzrkfWxxHzRcfVZj9g6nMtz7uwUU1r6CmvWL0vl +LsBpsemF/O+SJao6TofugDyxDep8wlAso871+Ezvo1GVHi/JhCD93xH4uPXW3xuLSc9 9HnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866178; x=1770470978; 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=TvedzD7+kJrfpkXnSgvR+lwDnj1DXH1BG+s75ebhGeM=; b=jYDEOVM0e90YcBpgNUYAIdOHoqV+pj+A5ZbMrzGSqc1/A6ExitmsqduOKqrLwdsW/u UI25DoHJMvIrXAJRJvMvVm3+4aH8pbCj14kNrXVD4YtfmBiyJ1ttsLzeCU8yA9baJ+yN /zEXunFWWfOMrKsPRPJ6A69E8T5YcwXVVgoag0Sw0c6ex6neCoVfuQ6Ix8afRDFWbzYd v4RmLE0pHP8X3MqNl2D+WigcniZkGkucEIGoS5qMhGeC44nqF4pR3XwE97Fni7zItcan /gtffBrZLQgGWua6Lm3+Cbq9rXRqVsjLy/mcX6+C1wqwCFxVPHvJzD7jhh4l+zjP4cPU Lr0Q== X-Forwarded-Encrypted: i=1; AJvYcCWS3CK+q/oejOwnB3F+V4NttElskcopvIosQyOg0HLBYq3qVFZPW8T5F9wPKz9hnN4Dno4+0FyY3/G1EEg=@vger.kernel.org X-Gm-Message-State: AOJu0YyCXOBoXECX47SdJ0P6qB6KKS417OcmJMEXphUhs30OivX9ewWG Qr6BQJ8AVLwTHU+iU+gAHYV5IDnTAzRpGaxWMErz8Plpxl79jxfQoBbjaKuujma7iEYRcQSg7Ce zo0q/OsCKo/B3QcnLq/9EbA== X-Received: from wmpc35.prod.google.com ([2002:a05:600c:4a23:b0:47e:dc0c:276f]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:8289:b0:480:32da:f338 with SMTP id 5b1f17b1804b1-482db45cb90mr66590785e9.14.1769866178166; Sat, 31 Jan 2026 05:29:38 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:36 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-19-vdonnefort@google.com> Subject: [PATCH v11 18/30] tracing: Check for undefined symbols in simple_ring_buffer From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The simple_ring_buffer implementation must remain simple enough to be used by the pKVM hypervisor. Prevent the object build if unresolved symbols are found. Reviewed-by: Steven Rostedt (Google) Signed-off-by: Vincent Donnefort diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index 9e86c43bf320..9f675d5d27c7 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile @@ -131,4 +131,20 @@ obj-$(CONFIG_TRACE_REMOTE) +=3D trace_remote.o obj-$(CONFIG_SIMPLE_RING_BUFFER) +=3D simple_ring_buffer.o obj-$(CONFIG_TRACE_REMOTE_TEST) +=3D remote_test.o =20 +# +# simple_ring_buffer is used by the pKVM hypervisor which does not have ac= cess +# to all kernel symbols. Fail the build if forbidden symbols are found. +# +UNDEFINED_ALLOWLIST :=3D memset alt_cb_patch_nops __x86 __ubsan __asan __k= asan __gcov __aeabi_unwind +UNDEFINED_ALLOWLIST +=3D __stack_chk_fail stackleak_track_stack __ref_stac= k __sanitizer +UNDEFINED_ALLOWLIST :=3D $(addprefix -e , $(UNDEFINED_ALLOWLIST)) + +quiet_cmd_check_undefined =3D NM $< + cmd_check_undefined =3D test -z "`$(NM) -u $< | grep -v $(UNDEFINED_= ALLOWLIST)`" + +$(obj)/%.o.checked: $(obj)/%.o FORCE + $(call if_changed,check_undefined) + +always-$(CONFIG_SIMPLE_RING_BUFFER) +=3D simple_ring_buffer.o.checked + libftrace-y :=3D ftrace.o --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 9DD1D3590CF for ; Sat, 31 Jan 2026 13:29:40 +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=1769866183; cv=none; b=D3Z08h67Si7X1MISsEUKQSyX2Qn83U7FNznMcwwgpAbPYaUHwYghbeSaeyUBuuwPnZuUCXfEUFahADkB+1GaffGM3cKMIQYlOb4JO29MyQS4IaeVPbSRpDtjtsLNhB+fLS9As2BLMUbK8zyxgtG+Dr5v4LPs0syrVyYbBxZkQ0A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866183; c=relaxed/simple; bh=ouvJUoJUpR1mFwPmUQ3xPtrj56aS4AFjvYK+Sql02VI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Ku7pD9pJmoWnRuLAlaVwLxDQETn5SD7Z2Us48jP3jYbG8KIgsKINExjwvx58uKRM8LG/lbl5bYdFYfT98S2n2PhZGsi3AKgu4wgF4Hps+66TYpiPImtLK5HYbQAkPXEPcF5BSuJv7pyNhdl/cfG+OXQwAs0mKCcQMuPF2XT7kf4= 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=FTLvxuRV; 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="FTLvxuRV" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4806e7c4220so24409445e9.2 for ; Sat, 31 Jan 2026 05:29:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866179; x=1770470979; 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=l98zitaR53RSPxZD96UzJ/EQCiuzXkQZto2Hc26QYKI=; b=FTLvxuRVdfvxlb2bqhI+LZj0d0H2qn4UA4BmvFVbg9/qO/c9YilCQ5eLvqirv1X9jB FV8oClXwCK0m3iUPXdhBwWcCG271bc4pSSagqZaxPWrtnaNLEeZk9EzWohwUvaE0AP2q bQDzXlVmiBZAO/p5zv7e5ypvukgyFCF+J0Qu4Ygeg9sNBRrrRYhE2abLTvItIJk10/yp 0OKLr7wu+vdtwpiyqunYaQH+nRO/S1R2yLQHe1/tYUvxeNw7C7lrpaHa7E51wENWOBPJ xqQTVEwYMjWkKlUL5FEyFR/g3FATUdAHY48xyOIz8bbYbEYopkBTaJ8wQmZRz0TiuKsG 1rTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866179; x=1770470979; 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=l98zitaR53RSPxZD96UzJ/EQCiuzXkQZto2Hc26QYKI=; b=aFOfqWBUdFpgdVmQ6bIsH8sRqiGea5glz/z2MBAVHu2bDRIzTyYyRlkSfYPfpXyOns SPfFap+Oi4XGcCL5nmvqgeFQzvuziv2EHs8nIiRn8rBgCnRMQNMQvn/uZgXzrFM1lOqB aGMPKENu8IUmRfZcbXAdj5Y/TYRmS19ncyF9s4VvV8ZwT45v5BD8nMm7BIO/rpDZrIlp VFvlquGuffN+JRjl5i/AzyvSdJXwZvLauvwxUVB5ElhjJtqYnWgrOYJ0ponGNOWobfsO XtNTOnrWY039wciv4UZnkRpy0QTBXiKRidi5nbQnxkPWGHGIK4vvtZv6+3Wc9e3pMxtn JkoQ== X-Forwarded-Encrypted: i=1; AJvYcCVAlKfIpn43pmFJrrR1iTtwIvzDRz0LsKQ+TNl827/PcoOm8NJ4IIa5zXUEpRIgq2fLN6tiUYTpjXD2W30=@vger.kernel.org X-Gm-Message-State: AOJu0YyRpFBEPQ3M7bTL/+85dQ6w9tqev9r5m6FHtPbDdRvFlGnppDk2 bB+iYU98njeIVWwM3CK3M0ahcOLZILPsj1jpjSjQbEOhd4qLbxkU9qw3eIjj37Wsya5QFohgghu 1TrCVl4ulCV+QzwxJ2fuafQ== X-Received: from wmqu15.prod.google.com ([2002:a05:600c:19cf:b0:477:a0a1:eae8]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1385:b0:480:6852:8d94 with SMTP id 5b1f17b1804b1-482db499781mr72429095e9.27.1769866179006; Sat, 31 Jan 2026 05:29:39 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:37 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-20-vdonnefort@google.com> Subject: [PATCH v11 19/30] KVM: arm64: Add PKVM_DISABLE_STAGE2_ON_PANIC From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort , Kalesh Singh Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" On NVHE_EL2_DEBUG, when using pKVM, the host stage-2 is relaxed to grant the kernel access to the stacktrace, hypervisor bug table and text to symbolize addresses. This is unsafe for production. In preparation for adding more debug options to NVHE_EL2_DEBUG, decouple the stage-2 relaxation into a separate option. While at it, rename PROTECTED_NVHE_STACKTRACE into PKVM_STACKTRACE, following the same naming scheme as PKVM_DISABLE_STAGE2_ON_PANIC. Reviewed-by: Kalesh Singh Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index 4f803fd1c99a..6498dec00fe9 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -43,9 +43,27 @@ menuconfig KVM =20 If unsure, say N. =20 +if KVM + +config PTDUMP_STAGE2_DEBUGFS + bool "Present the stage-2 pagetables to debugfs" + depends on DEBUG_KERNEL + depends on DEBUG_FS + depends on ARCH_HAS_PTDUMP + select PTDUMP + default n + help + Say Y here if you want to show the stage-2 kernel pagetables + layout in a debugfs file. This information is only useful for kernel de= velopers + who are working in architecture specific areas of the kernel. + It is probably not a good idea to enable this feature in a production + kernel. + + If in doubt, say N. + config NVHE_EL2_DEBUG bool "Debug mode for non-VHE EL2 object" - depends on KVM + default n help Say Y here to enable the debug mode for the non-VHE KVM EL2 object. Failure reports will BUG() in the hypervisor. This is intended for @@ -53,10 +71,23 @@ config NVHE_EL2_DEBUG =20 If unsure, say N. =20 -config PROTECTED_NVHE_STACKTRACE - bool "Protected KVM hypervisor stacktraces" - depends on NVHE_EL2_DEBUG +if NVHE_EL2_DEBUG + +config PKVM_DISABLE_STAGE2_ON_PANIC + bool "Disable the host stage-2 on panic" default n + help + Relax the host stage-2 on hypervisor panic to allow the kernel to + unwind and symbolize the hypervisor stacktrace. This however tampers + the system security. This is intended for local EL2 hypervisor + development. + + If unsure, say N. + +config PKVM_STACKTRACE + bool "Protected KVM hypervisor stacktraces" + depends on PKVM_DISABLE_STAGE2_ON_PANIC + default y help Say Y here to enable pKVM hypervisor stacktraces on hyp_panic() =20 @@ -66,21 +97,6 @@ config PROTECTED_NVHE_STACKTRACE =20 If unsure, or not using protected nVHE (pKVM), say N. =20 -config PTDUMP_STAGE2_DEBUGFS - bool "Present the stage-2 pagetables to debugfs" - depends on KVM - depends on DEBUG_KERNEL - depends on DEBUG_FS - depends on ARCH_HAS_PTDUMP - select PTDUMP - default n - help - Say Y here if you want to show the stage-2 kernel pagetables - layout in a debugfs file. This information is only useful for kernel de= velopers - who are working in architecture specific areas of the kernel. - It is probably not a good idea to enable this feature in a production - kernel. - - If in doubt, say N. - +endif # NVHE_EL2_DEBUG +endif # KVM endif # VIRTUALIZATION diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index cc7d5d1709cb..54aedf93c78b 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -539,7 +539,7 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, = u64 spsr, =20 /* All hyp bugs, including warnings, are treated as fatal. */ if (!is_protected_kvm_enabled() || - IS_ENABLED(CONFIG_NVHE_EL2_DEBUG)) { + IS_ENABLED(CONFIG_PKVM_DISABLE_STAGE2_ON_PANIC)) { struct bug_entry *bug =3D find_bug(elr_in_kimg); =20 if (bug) diff --git a/arch/arm64/kvm/hyp/nvhe/host.S b/arch/arm64/kvm/hyp/nvhe/host.S index eef15b374abb..3092befcd97c 100644 --- a/arch/arm64/kvm/hyp/nvhe/host.S +++ b/arch/arm64/kvm/hyp/nvhe/host.S @@ -120,7 +120,7 @@ SYM_FUNC_START(__hyp_do_panic) =20 mov x29, x0 =20 -#ifdef CONFIG_NVHE_EL2_DEBUG +#ifdef PKVM_DISABLE_STAGE2_ON_PANIC /* Ensure host stage-2 is disabled */ mrs x0, hcr_el2 bic x0, x0, #HCR_VM diff --git a/arch/arm64/kvm/hyp/nvhe/stacktrace.c b/arch/arm64/kvm/hyp/nvhe= /stacktrace.c index 5b6eeab1a774..7c832d60d22b 100644 --- a/arch/arm64/kvm/hyp/nvhe/stacktrace.c +++ b/arch/arm64/kvm/hyp/nvhe/stacktrace.c @@ -34,7 +34,7 @@ static void hyp_prepare_backtrace(unsigned long fp, unsig= ned long pc) stacktrace_info->pc =3D pc; } =20 -#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE +#ifdef CONFIG_PKVM_STACKTRACE #include =20 DEFINE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_sta= cktrace); @@ -134,11 +134,11 @@ static void pkvm_save_backtrace(unsigned long fp, uns= igned long pc) =20 unwind(&state, pkvm_save_backtrace_entry, &idx); } -#else /* !CONFIG_PROTECTED_NVHE_STACKTRACE */ +#else /* !CONFIG_PKVM_STACKTRACE */ static void pkvm_save_backtrace(unsigned long fp, unsigned long pc) { } -#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ +#endif /* CONFIG_PKVM_STACKTRACE */ =20 /* * kvm_nvhe_prepare_backtrace - prepare to dump the nVHE backtrace diff --git a/arch/arm64/kvm/stacktrace.c b/arch/arm64/kvm/stacktrace.c index af5eec681127..9724c320126b 100644 --- a/arch/arm64/kvm/stacktrace.c +++ b/arch/arm64/kvm/stacktrace.c @@ -197,7 +197,7 @@ static void hyp_dump_backtrace(unsigned long hyp_offset) kvm_nvhe_dump_backtrace_end(); } =20 -#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE +#ifdef CONFIG_PKVM_STACKTRACE DECLARE_KVM_NVHE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_stacktrace); =20 @@ -225,12 +225,12 @@ static void pkvm_dump_backtrace(unsigned long hyp_off= set) kvm_nvhe_dump_backtrace_entry((void *)hyp_offset, stacktrace[i]); kvm_nvhe_dump_backtrace_end(); } -#else /* !CONFIG_PROTECTED_NVHE_STACKTRACE */ +#else /* !CONFIG_PKVM_STACKTRACE */ static void pkvm_dump_backtrace(unsigned long hyp_offset) { - kvm_err("Cannot dump pKVM nVHE stacktrace: !CONFIG_PROTECTED_NVHE_STACKTR= ACE\n"); + kvm_err("Cannot dump pKVM nVHE stacktrace: !CONFIG_PKVM_STACKTRACE\n"); } -#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ +#endif /* CONFIG_PKVM_STACKTRACE */ =20 /* * kvm_nvhe_dump_backtrace - Dump KVM nVHE hypervisor backtrace. --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 AB36735971D for ; Sat, 31 Jan 2026 13:29:41 +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=1769866183; cv=none; b=Q0FpT2E65fkJqQ1pPS9g9UsmBLuHFPh/HEby9H1tUugHxULzChgZVYlexxhDXuVVL2RlndRysU4skgLbi2wxeLsg2SaZTGQkfZHgAdi6aDjqBpl/FgG+bS0pTI+Mcx8s4/doaRquDhTI5/G5qyJyuTJI9Ik24L672mpCKjbk3So= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866183; c=relaxed/simple; bh=fhPeQWVBSnCBrnALKVurTRUuPiSMZ+f8M8+cUOxcd9o=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=CM+3TVH9iXGm0wXq6Uup4xyhJNt+mg3UW1bTczgwCnkvJsvARUjBT52llKYQnJyyX0PkZ/9ryhG6C0qPCnqxIULxfhK69JetxoC1Ri+4z05NCbzngUmSUM5lQ39lE0ZwvwBL+2dXnVBL4xOdgzMT2EaQvbcOFF9YGloFn5mZVKg= 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=shR+yCPa; 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="shR+yCPa" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-482d8e6e13aso15113295e9.3 for ; Sat, 31 Jan 2026 05:29:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866180; x=1770470980; 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=goZ+MaQKy7l7B7ncr3K66S9aihGDrIDC3mypa0RPtIo=; b=shR+yCPa5yAlvHuz8iMQb28m8bm+SbLvib+3DZAF1QqMQ9G3hA0pJ1JnjKX3gsps/B AiX0KEY4yih3k0Lqqugl23VheIWccwYTVd4bkMbfBfGEAUXtIQRPvluhe6LAfvCNTz1Q U4i72sPDOaFx1x3juNhgHIFnhS9BDWWTKAbDmFNk1EjlSez4cGVKzDWO2iDfjUml/Md6 zbwXj+2bH9ECyhpX0A51vB7Lzz7Gfat3JDLMYD9dQxNwcR8EoS9AO5sJsMX5TXF3v0t/ 9YSG+SSrbouSiMOcfLohk98g4gVcTiKC1cJSZxD+NFMZtgiXAvidSKN+8VddI7YhRv4m RuaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866180; x=1770470980; 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=goZ+MaQKy7l7B7ncr3K66S9aihGDrIDC3mypa0RPtIo=; b=FpJJ47W6eGJwkO21kvXhwsmg1NKU6nODX95ClP0u9ljcTWCARQk45KRsQMhIkDHUcB FMXu3qEoBEQNybmGn61jAR5TXRlBcsdLj5QkKfVXBLiS2vqhqMd7l3i9LMxmThQ2BIKK ouh9+pZpDaL5ibQokH/zj+3drtyefwla3VcEupU5x0IgwzHSYrvfrvOcQY5uU0e0Jexl wJ71I6ZkwQL9NZEHcL0QVUMDN+bCIybAZ1H+0G3fum5GGczPMRIq6CJ6j3KiZO76tr4C wFPqeVTuP+0L8tr1F8An/5JD+wHs5XxCTPtB7VZ4Nds+ReiKl8upseyLjNqaxlOLV5nA JIiw== X-Forwarded-Encrypted: i=1; AJvYcCVlU/YIjxcrBvc8OLn/rFRPsOw22lYJkxXcT0Lwc+f91GVMRzAyMDenxmNlX/02AyLUrf4v44Zgy7/eo2I=@vger.kernel.org X-Gm-Message-State: AOJu0Yxx5EZYO2dWUU2CHAlFg2HS64mZqlRPqoh3WdfpcaSPktMzYmre VKS7UcgsoPdUwk8A1UQXWWX9ZibDmU612lMABOMX167OWD25SnvThpV5yMOA9j4Xajxsw4Yq4MZ ngilylxaCfeWEn6LJpp8AMQ== X-Received: from wmz6.prod.google.com ([2002:a05:600c:6b66:b0:480:1b84:b6e]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1da8:b0:480:3a71:92b2 with SMTP id 5b1f17b1804b1-482db498227mr71271215e9.26.1769866180081; Sat, 31 Jan 2026 05:29:40 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:38 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-21-vdonnefort@google.com> Subject: [PATCH v11 20/30] KVM: arm64: Add clock support to nVHE/pKVM hyp From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In preparation for supporting tracing from the nVHE hyp, add support to generate timestamps with a clock fed by the CNTCVT counter. The clock can be kept in sync with the kernel's by updating the slope values. This will be done later. As current we do only create a trace clock, make the whole support dependent on the upcoming CONFIG_NVHE_EL2_TRACING. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/kvm/hyp/include/nvhe/clock.h b/arch/arm64/kvm/hyp/i= nclude/nvhe/clock.h new file mode 100644 index 000000000000..9f429f5c0664 --- /dev/null +++ b/arch/arm64/kvm/hyp/include/nvhe/clock.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ARM64_KVM_HYP_NVHE_CLOCK_H +#define __ARM64_KVM_HYP_NVHE_CLOCK_H +#include + +#include + +#ifdef CONFIG_NVHE_EL2_TRACING +void trace_clock_update(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_cyc); +u64 trace_clock(void); +#else +static inline void +trace_clock_update(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_cyc) { } +static inline u64 trace_clock(void) { return 0; } +#endif +#endif diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Mak= efile index a244ec25f8c5..8dc95257c291 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -17,7 +17,7 @@ ccflags-y +=3D -fno-stack-protector \ hostprogs :=3D gen-hyprel HOST_EXTRACFLAGS +=3D -I$(objtree)/include =20 -lib-objs :=3D clear_page.o copy_page.o memcpy.o memset.o +lib-objs :=3D clear_page.o copy_page.o memcpy.o memset.o tishift.o lib-objs :=3D $(addprefix ../../../lib/, $(lib-objs)) =20 CFLAGS_switch.nvhe.o +=3D -Wno-override-init @@ -29,6 +29,7 @@ hyp-obj-y +=3D ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cp= uif-proxy.o ../entry.o \ ../fpsimd.o ../hyp-entry.o ../exception.o ../pgtable.o hyp-obj-y +=3D ../../../kernel/smccc-call.o hyp-obj-$(CONFIG_LIST_HARDENED) +=3D list_debug.o +hyp-obj-$(CONFIG_NVHE_EL2_TRACING) +=3D clock.o hyp-obj-y +=3D $(lib-objs) =20 ## diff --git a/arch/arm64/kvm/hyp/nvhe/clock.c b/arch/arm64/kvm/hyp/nvhe/cloc= k.c new file mode 100644 index 000000000000..32fc4313fe43 --- /dev/null +++ b/arch/arm64/kvm/hyp/nvhe/clock.c @@ -0,0 +1,65 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2025 Google LLC + * Author: Vincent Donnefort + */ + +#include + +#include +#include + +static struct clock_data { + struct { + u32 mult; + u32 shift; + u64 epoch_ns; + u64 epoch_cyc; + u64 cyc_overflow64; + } data[2]; + u64 cur; +} trace_clock_data; + +static u64 __clock_mult_uint128(u64 cyc, u32 mult, u32 shift) +{ + __uint128_t ns =3D (__uint128_t)cyc * mult; + + ns >>=3D shift; + + return (u64)ns; +} + +/* Does not guarantee no reader on the modified bank. */ +void trace_clock_update(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_cyc) +{ + struct clock_data *clock =3D &trace_clock_data; + u64 bank =3D clock->cur ^ 1; + + clock->data[bank].mult =3D mult; + clock->data[bank].shift =3D shift; + clock->data[bank].epoch_ns =3D epoch_ns; + clock->data[bank].epoch_cyc =3D epoch_cyc; + clock->data[bank].cyc_overflow64 =3D ULONG_MAX / mult; + + smp_store_release(&clock->cur, bank); +} + +/* Use untrusted host data */ +u64 trace_clock(void) +{ + struct clock_data *clock =3D &trace_clock_data; + u64 bank =3D smp_load_acquire(&clock->cur); + u64 cyc, ns; + + cyc =3D __arch_counter_get_cntvct() - clock->data[bank].epoch_cyc; + + if (likely(cyc < clock->data[bank].cyc_overflow64)) { + ns =3D cyc * clock->data[bank].mult; + ns >>=3D clock->data[bank].shift; + } else { + ns =3D __clock_mult_uint128(cyc, clock->data[bank].mult, + clock->data[bank].shift); + } + + return (u64)ns + clock->data[bank].epoch_ns; +} --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 7D92F3542E6 for ; Sat, 31 Jan 2026 13:29:42 +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=1769866185; cv=none; b=ZF0YxhAXrjWY0fboKm9lZQswpG6z5Un9qYsEYr6tvV9xBFofQZwN9BGvQKQIyOQ/dxQQ3Qne8y3XQSeo6BDvmbAXcGUUBVRX66X0eGUpMpi2CkUbdupMNM+yKOpwPMu+6Egdn55LYGDunPvvUrlhAr3kYOBPE3pCp+GkkZjt6t8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866185; c=relaxed/simple; bh=ccyYmnlDu9EEGW1I0k4h1tVPmLHzSWBhCL7g2xyCtiY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=clMvDRI8+qerau28UTeXilLetmyG76hsSqiz8CeDcdjPjbYYd5WrecIGp2M3yWn896scpsw+EnTa+hbtVhKLRj6M7pdAxh+EBGjCb/ddpz47xZhFmwzF9tCCSDmksJAuXUz6lc/yTMNvibkD4Z/wMCNO72jMu8Z21ZokCa0xG7M= 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=4UPHmMVc; 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="4UPHmMVc" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4806fc58fa5so27440275e9.2 for ; Sat, 31 Jan 2026 05:29:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866181; x=1770470981; 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=7nEWGCUeag+PoVLv9JhhY/ni1DDp7IYQQDqy/MX6oMM=; b=4UPHmMVc+H2M6nyI9DFV8lRk+ag7YaZj90fT291AYHzfnqMn5NjmMnQnhSfV+qmey4 vhjTsELMKZti6EdhiX/hI42HOo+v2LZOtt807Q2QKPunB6Xax+q9Mk4J1OLYB4kkic3u LKT6k+CsNxZ/Q84QwBfNIjtwxu5A5LCQWiqPAJr6AUDPZFUV7YEC4FMG9bXRU88wys1X qMWduslGyWBcHrdpN5+oNEFibgqJedCrHJLh6ET5hZj2Bc3WzrnkQDB/x//duAcEE6BU KFdmisoHJ5AvjHvRU1yn/Crna893AVklVrfoRyCdziJtyJIf34nSgOAD4jCqK4FKpgV8 2/gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866181; x=1770470981; 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=7nEWGCUeag+PoVLv9JhhY/ni1DDp7IYQQDqy/MX6oMM=; b=feimFOM155+naP3gQ42FR/9oq+wghzQ8nSu3C2lPtJchc4TkGzV4c7SkMXq22fZsLw uU9rjgUCZGnXw/EFVHbfWJ3nVHlaun4HhuSNfAKU5m9YSrk6ofmai8UlcWe0xUD3jrQb yVdQfaogsrUBpR6d5h6QIcxLEm+xioPwvFjaix0OQHOdmyIfCnZKNxGDuqzbSQ1M7Aqg EecS61aH42a4HRHIN1nvDEYap+a15AtlaHCFZ/g4gZgwfpwciZtIcuXYgCmpSGgrcTEj Sn6dsHJXD404WmxsAJGYMyH+FvK471r9FtUkLjEE/3mvgJjANGCGeIXNwrGWkZs6cbve DCJw== X-Forwarded-Encrypted: i=1; AJvYcCUFYjoYxaNGBoDDMfVviVf0LdIoy2wZY41Y6a1kp+HCinjEMbg6H7W4pZ7cVULQ2jc4joEEl0QLYUjgrrA=@vger.kernel.org X-Gm-Message-State: AOJu0Yx9CrPQC6+xMCaJg2e+aK6c/Xnhcp4mJLe1hC2iHhNdBu1bIsSL YjXuXPkhz9w6ITiNpVqDVXxiJ5+mdnKCUDqMQLmU2h4QN5mhvjfb+n7wVXhtNp8VCAOsojZK819 lCT64EfHxK6XunFqjaSWMNQ== X-Received: from wmqo22.prod.google.com ([2002:a05:600c:4fd6:b0:482:edb8:8b96]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:8a17:20b0:480:25ae:9993 with SMTP id 5b1f17b1804b1-482db47ce2emr55130925e9.20.1769866181059; Sat, 31 Jan 2026 05:29:41 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:39 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-22-vdonnefort@google.com> Subject: [PATCH v11 21/30] KVM: arm64: Initialise hyp_nr_cpus for nVHE hyp From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Knowing the number of CPUs is necessary for determining the boundaries of per-cpu variables, which will be used for upcoming hypervisor tracing. hyp_nr_cpus which stores this value, is only initialised for the pKVM hypervisor. Make it accessible for the nVHE hypervisor as well. With the kernel now responsible for initialising hyp_nr_cpus, the nr_cpus parameter is no longer needed in __pkvm_init. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_= hyp.h index 76ce2b94bd97..4bf63025061e 100644 --- a/arch/arm64/include/asm/kvm_hyp.h +++ b/arch/arm64/include/asm/kvm_hyp.h @@ -129,8 +129,7 @@ void __noreturn __hyp_do_panic(struct kvm_cpu_context *= host_ctxt, u64 spsr, #ifdef __KVM_NVHE_HYPERVISOR__ void __pkvm_init_switch_pgd(phys_addr_t pgd, unsigned long sp, void (*fn)(void)); -int __pkvm_init(phys_addr_t phys, unsigned long size, unsigned long nr_cpu= s, - unsigned long *per_cpu_base, u32 hyp_va_bits); +int __pkvm_init(phys_addr_t phys, unsigned long size, unsigned long *per_c= pu_base, u32 hyp_va_bits); void __noreturn __host_enter(struct kvm_cpu_context *host_ctxt); #endif =20 @@ -147,5 +146,6 @@ extern u64 kvm_nvhe_sym(id_aa64smfr0_el1_sys_val); extern unsigned long kvm_nvhe_sym(__icache_flags); extern unsigned int kvm_nvhe_sym(kvm_arm_vmid_bits); extern unsigned int kvm_nvhe_sym(kvm_host_sve_max_vl); +extern unsigned long kvm_nvhe_sym(hyp_nr_cpus); =20 #endif /* __ARM64_KVM_HYP_H__ */ diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 620a465248d1..be1fd6c5f74c 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -2411,7 +2412,7 @@ static int __init do_pkvm_init(u32 hyp_va_bits) preempt_disable(); cpu_hyp_init_context(); ret =3D kvm_call_hyp_nvhe(__pkvm_init, hyp_mem_base, hyp_mem_size, - num_possible_cpus(), kern_hyp_va(per_cpu_base), + kern_hyp_va(per_cpu_base), hyp_va_bits); cpu_hyp_init_features(); =20 @@ -2620,6 +2621,8 @@ static int __init init_hyp_mode(void) kvm_nvhe_sym(kvm_arm_hyp_percpu_base)[cpu] =3D (unsigned long)page_addr; } =20 + kvm_nvhe_sym(hyp_nr_cpus) =3D num_possible_cpus(); + /* * Map the Hyp-code called directly from the host */ diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm= /hyp/include/nvhe/mem_protect.h index 5f9d56754e39..f8a7b8c04c49 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -30,8 +30,6 @@ enum pkvm_component_id { PKVM_ID_FFA, }; =20 -extern unsigned long hyp_nr_cpus; - int __pkvm_prot_finalize(void); int __pkvm_host_share_hyp(u64 pfn); int __pkvm_host_unshare_hyp(u64 pfn); diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/h= yp-main.c index 8ffbbce5e2ed..5559b622ea57 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -486,17 +486,15 @@ static void handle___pkvm_init(struct kvm_cpu_context= *host_ctxt) { DECLARE_REG(phys_addr_t, phys, host_ctxt, 1); DECLARE_REG(unsigned long, size, host_ctxt, 2); - DECLARE_REG(unsigned long, nr_cpus, host_ctxt, 3); - DECLARE_REG(unsigned long *, per_cpu_base, host_ctxt, 4); - DECLARE_REG(u32, hyp_va_bits, host_ctxt, 5); + DECLARE_REG(unsigned long *, per_cpu_base, host_ctxt, 3); + DECLARE_REG(u32, hyp_va_bits, host_ctxt, 4); =20 /* * __pkvm_init() will return only if an error occurred, otherwise it * will tail-call in __pkvm_init_finalise() which will have to deal * with the host context directly. */ - cpu_reg(host_ctxt, 1) =3D __pkvm_init(phys, size, nr_cpus, per_cpu_base, - hyp_va_bits); + cpu_reg(host_ctxt, 1) =3D __pkvm_init(phys, size, per_cpu_base, hyp_va_bi= ts); } =20 static void handle___pkvm_cpu_set_vector(struct kvm_cpu_context *host_ctxt) diff --git a/arch/arm64/kvm/hyp/nvhe/setup.c b/arch/arm64/kvm/hyp/nvhe/setu= p.c index 90bd014e952f..d8e5b563fd3d 100644 --- a/arch/arm64/kvm/hyp/nvhe/setup.c +++ b/arch/arm64/kvm/hyp/nvhe/setup.c @@ -341,8 +341,7 @@ void __noreturn __pkvm_init_finalise(void) __host_enter(host_ctxt); } =20 -int __pkvm_init(phys_addr_t phys, unsigned long size, unsigned long nr_cpu= s, - unsigned long *per_cpu_base, u32 hyp_va_bits) +int __pkvm_init(phys_addr_t phys, unsigned long size, unsigned long *per_c= pu_base, u32 hyp_va_bits) { struct kvm_nvhe_init_params *params; void *virt =3D hyp_phys_to_virt(phys); @@ -355,7 +354,6 @@ int __pkvm_init(phys_addr_t phys, unsigned long size, u= nsigned long nr_cpus, return -EINVAL; =20 hyp_spin_lock_init(&pkvm_pgd_lock); - hyp_nr_cpus =3D nr_cpus; =20 ret =3D divide_memory_pool(virt, size); if (ret) --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 44D9F35503C for ; Sat, 31 Jan 2026 13:29:43 +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=1769866186; cv=none; b=EBaltXahtd1pEX0jEXuF4kVplmVHV2GqIz5PuRe/VPMPSjzSDX+jlfHDcLSPMJopyRsO2IrS6xUHocyUtavHq8EJG6+qrscLA9nkX2tMQbfewYrWNctwpQvHFfx+TztESHbImIMR1OA14Rq5Uzb2ACGDgA2u40PVklGtJwjZLck= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866186; c=relaxed/simple; bh=akk2UdENQbgS4aNRHidtxoT1q7g4hUSbv0c7DfQudsk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=N/Bq5D9TTN7bKXJabgjp0j6q1n4cbuutqwEa+wh+YQLlg4xHA/kDX5d4i3+1Nj0vgyE2RNSrWljLwrwFwkU1xUQaakPwJWh/vTaglx1reHCWZ5N4c5WFCnO3XhlxgSOJHs152IiUhfdblhZ8bSrwduDR4TQuCqVfIfnAtlGJSvk= 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=t/pNujnO; 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="t/pNujnO" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-482d8e6e13aso15113385e9.3 for ; Sat, 31 Jan 2026 05:29:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866182; x=1770470982; 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=l1Vepb6gWbmfw10H3EWIgkkfZunr0icHCkKhsRxDAh8=; b=t/pNujnOwB85L2YeTRb9dJriij34mynEj5+sU3zaNqDyqewNrkT+6n8/7QqKIQDxx0 UafwOZslGpmcg3+SkV8McU7PPHylq8mzwqAThEnRKe6JpXZoPQ1rTvOFnrNOmo/h7Dll f9GPFXAK8oe+QeAycwdx0DGi0S98W33luaxCfT62Jh9FTTB4hyKuLmUUhZIZz22c1dX5 I3b5HxmJFui5PBxWw5cYLMkq2rC0381VwsIiFZ0wVxcaaBsquXWjKjLkjfWgN6CW9vvy IjMs/FYTUI3nI5qvuBhjs+cmADXlaM3pYlSYpdhva3BU7yamqAHAB7R8qOZyhcS5rUM7 WeIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866182; x=1770470982; 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=l1Vepb6gWbmfw10H3EWIgkkfZunr0icHCkKhsRxDAh8=; b=WnD8Qt9S7WBKqc4lGmcYmXRKxhBn7SckV5CXED4df+XU8aINaL1q1+nTeB8Yc8sNSE j11MDpvxJUlLSS9HlVJxE6vgnhGsLVqVbhtTXtMRAllWZV3h8fED/4Dj6a5bLbQ06K5+ cbu0B8zymB9jRGl56xaAw5G+H9bh3502f/E/dkOppuV4z0qZXLYifKVnYGkh3KP39YY7 +jYn+cH2ZG7wzFUHkhXP7KmiW0lQ5DWsVRGsv6Z1rzdTBzvI4UzW1Ouo3HJw6dqZaODQ +Hl/XpZ+V/k+I4UFILC026MQ50w/wO2GfdgN1l5+nhga9N8Se659SUQPdl43650DZ0LX H+DQ== X-Forwarded-Encrypted: i=1; AJvYcCUtAeBw0srXiQl1eyw9tfJuVLcqQtTcu/dlQa7oK8b9gdWyjmI9YUPkbFIut2j+PPa86APupomqRV7g2X8=@vger.kernel.org X-Gm-Message-State: AOJu0Yy/Z6TYt2kCkEfAWlvpZWO1sDl9a6a8IT8gl85Y9fniUHFJYzee zvYorJpdyDq35h+fksoCfLMuWGF8hxrnj5Elic9o6f1IwyYx7db2wdi5xPxbG3gkn/nHD5mV0as Y2q9PHFD1ZnbVnqXvP7/5Rg== X-Received: from wmcn4.prod.google.com ([2002:a05:600c:c0c4:b0:480:6afd:1fd0]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1d03:b0:477:7f4a:44b4 with SMTP id 5b1f17b1804b1-482db4567d6mr85643685e9.1.1769866182054; Sat, 31 Jan 2026 05:29:42 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:40 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-23-vdonnefort@google.com> Subject: [PATCH v11 22/30] KVM: arm64: Support unaligned fixmap in the pKVM hyp From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Return the fixmap VA with the page offset, instead of the page base address. This allows to use hyp_fixmap_map() seamlessly regardless of the address alignment. While at it, do the same for hyp_fixblock_map(). Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/kvm/hyp/nvhe/mm.c b/arch/arm64/kvm/hyp/nvhe/mm.c index ae8391baebc3..a6eafd72f87c 100644 --- a/arch/arm64/kvm/hyp/nvhe/mm.c +++ b/arch/arm64/kvm/hyp/nvhe/mm.c @@ -244,7 +244,7 @@ static void *fixmap_map_slot(struct hyp_fixmap_slot *sl= ot, phys_addr_t phys) =20 void *hyp_fixmap_map(phys_addr_t phys) { - return fixmap_map_slot(this_cpu_ptr(&fixmap_slots), phys); + return fixmap_map_slot(this_cpu_ptr(&fixmap_slots), phys) + offset_in_pag= e(phys); } =20 static void fixmap_clear_slot(struct hyp_fixmap_slot *slot) @@ -366,7 +366,7 @@ void *hyp_fixblock_map(phys_addr_t phys, size_t *size) #ifdef HAS_FIXBLOCK *size =3D PMD_SIZE; hyp_spin_lock(&hyp_fixblock_lock); - return fixmap_map_slot(&hyp_fixblock_slot, phys); + return fixmap_map_slot(&hyp_fixblock_slot, phys) + offset_in_page(phys); #else *size =3D PAGE_SIZE; return hyp_fixmap_map(phys); --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 0C90525D216 for ; Sat, 31 Jan 2026 13:29:45 +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=1769866189; cv=none; b=nhhSLpNApcdJi97PTOfLMOjsX6Av344KzHSwV320h3Jmxwzk5/FMd0W1HPjYgPiiWG5KbNffk5mYE79juI3nU9CRnsV2JZEaxi62Daywyk+z8mJGyoGu5nM5S32Xb30HEKgmod5nq3/91Jmflup4EuWwItzlvm4ViEGsVvzqab4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866189; c=relaxed/simple; bh=eiztNk9V9XLgxaU9V8P/ZDojwGXQJZ05Pi8JyM4gudw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=iXmih1I2KlaFqCoLQdHucze7fS4JClR0Gabg0Ilbn5VjRX67hlNJnPIIKDDdHu9i7R9s5xogURtCNQV86mqWVh8qRv8gsJ4KAYq5+jVp9dDSYEsZc6uJMY/yqev40KEzrefyxS6BcBlv21L2gokodzBbM8SlNTfZRfl9yQFb3Lc= 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=3bL51i2K; 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="3bL51i2K" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4806cb47edaso22622525e9.1 for ; Sat, 31 Jan 2026 05:29:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866183; x=1770470983; 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=PZYjwWiOCxpTt30ZNbaITSBX6aRcC/J92BrjAxtHnOo=; b=3bL51i2Klih/Xxo6kLeZBrw6joHJlSqK9zhxg3Li7bd2DpsmDpF7n97hHrS3yKgzd4 U85QlZtzAiMpDgItZkM8yzzc0Zf/drjyjmFQAsLmi/8+Tj+uNq4E5rlqfu61sgcxRe6B D/63CmZ5xH8Guv5Fi+Fe2p8ZDPs7hLjo+sPCu5tHRaB67fHhLX9CohFg1rJnTduNxqKF lNclK5EYEHgZg+Jx/RD3iC0H19Y5w2H+GLg/9phK/xbe0gPhAP535SXNXfFUcHC27md6 aTDdP5bDjElKx0M5l29F/48aQqBJEJMmAcsvRSxn8ELhYiQMLoYzKjrnTJLGDeQiL1gY yz+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866183; x=1770470983; 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=PZYjwWiOCxpTt30ZNbaITSBX6aRcC/J92BrjAxtHnOo=; b=KxZahGaQk2LzQzw+35CLbvhRIDeEQXKTwYtdOUCfHcPzhU7BkX7C1Z3y6X0+j6UQp1 uhMuJwiZVrHUe3GQvxvZ3CpXSc3j1eVqWy/h8tH9ghoDMkwgTUrcxQr0MkMfNIjpK/2z UjtwP5f3AZOxlpfkqvn1IqgqCncvxBmqRU785mPV/wcZDFgiik1lflixp9rz02q6mC+y s8vrfMlWjM0q9m4YI8bhcfPMQeOy6V3qANv4WXlaEBZ+CesPp1v1CDAFuGrDsF0Vq1fQ 0+ky2QJgv8FE8piJp+H60A8MgRwNPVMhkItF61eUjwC9YvcUZCcTnB0qOcZ7TKiWEGGT Zf0Q== X-Forwarded-Encrypted: i=1; AJvYcCU/XMg2il/a6LA4TOUodacIP0bTAv6diu2mWDzY1ZipaN8CGOHe/eygwAN2qIz2qSslFE8wv1nOfm3mV+E=@vger.kernel.org X-Gm-Message-State: AOJu0Yxf2PoTK3kgY8DAOtgcu8RsUTs0vN6Qwg0H06HK4Y1NZ7uP9XPe rhJMYMisNGmerkWz5ZvBjmv1UNAMDMHetfLXHHidcrTNFCCuvQNivLOijWh6A4udh8ZMfq7Xi/e Rqsc6f8+7hnc0ZYAi9Fd3Vw== X-Received: from wmsm42.prod.google.com ([2002:a05:600c:3b2a:b0:47e:d9ed:20f0]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4e91:b0:47f:1332:e5f with SMTP id 5b1f17b1804b1-480829b5cfamr135738605e9.12.1769866183064; Sat, 31 Jan 2026 05:29:43 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:41 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-24-vdonnefort@google.com> Subject: [PATCH v11 23/30] KVM: arm64: Add tracing capability for the nVHE/pKVM hyp From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There is currently no way to inspect or log what's happening at EL2 when the nVHE or pKVM hypervisor is used. With the growing set of features for pKVM, the need for tooling is more pressing. And tracefs, by its reliability, versatility and support for user-space is fit for purpose. Add support to write into a tracefs compatible ring-buffer. There's no way the hypervisor could log events directly into the host tracefs ring-buffers. So instead let's use our own, where the hypervisor is the writer and the host the reader. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_= asm.h index ce516d8187b1..c3a7fc939f42 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -89,6 +89,10 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___pkvm_vcpu_load, __KVM_HOST_SMCCC_FUNC___pkvm_vcpu_put, __KVM_HOST_SMCCC_FUNC___pkvm_tlb_flush_vmid, + __KVM_HOST_SMCCC_FUNC___tracing_load, + __KVM_HOST_SMCCC_FUNC___tracing_unload, + __KVM_HOST_SMCCC_FUNC___tracing_enable, + __KVM_HOST_SMCCC_FUNC___tracing_swap_reader, }; =20 #define DECLARE_KVM_VHE_SYM(sym) extern char sym[] diff --git a/arch/arm64/include/asm/kvm_hyptrace.h b/arch/arm64/include/asm= /kvm_hyptrace.h new file mode 100644 index 000000000000..9c30a479bc36 --- /dev/null +++ b/arch/arm64/include/asm/kvm_hyptrace.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ARM64_KVM_HYPTRACE_H_ +#define __ARM64_KVM_HYPTRACE_H_ + +#include + +struct hyp_trace_desc { + unsigned long bpages_backing_start; + size_t bpages_backing_size; + struct trace_buffer_desc trace_buffer_desc; + +}; +#endif diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index 6498dec00fe9..c7f50492f2cf 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -73,6 +73,11 @@ config NVHE_EL2_DEBUG =20 if NVHE_EL2_DEBUG =20 +config NVHE_EL2_TRACING + bool + depends on TRACING + default y + config PKVM_DISABLE_STAGE2_ON_PANIC bool "Disable the host stage-2 on panic" default n diff --git a/arch/arm64/kvm/hyp/include/nvhe/trace.h b/arch/arm64/kvm/hyp/i= nclude/nvhe/trace.h new file mode 100644 index 000000000000..7da8788ce527 --- /dev/null +++ b/arch/arm64/kvm/hyp/include/nvhe/trace.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ARM64_KVM_HYP_NVHE_TRACE_H +#define __ARM64_KVM_HYP_NVHE_TRACE_H +#include + +#ifdef CONFIG_NVHE_EL2_TRACING +void *tracing_reserve_entry(unsigned long length); +void tracing_commit_entry(void); + +int __tracing_load(unsigned long desc_va, size_t desc_size); +void __tracing_unload(void); +int __tracing_enable(bool enable); +int __tracing_swap_reader(unsigned int cpu); +#else +static inline void *tracing_reserve_entry(unsigned long length) { return N= ULL; } +static inline void tracing_commit_entry(void) { } + +static inline int __tracing_load(unsigned long desc_va, size_t desc_size) = { return -ENODEV; } +static inline void __tracing_unload(void) { } +static inline int __tracing_enable(bool enable) { return -ENODEV; } +static inline int __tracing_swap_reader(unsigned int cpu) { return -ENODEV= ; } +#endif +#endif diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Mak= efile index 8dc95257c291..f1840628d2d6 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -29,9 +29,12 @@ hyp-obj-y +=3D ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-c= puif-proxy.o ../entry.o \ ../fpsimd.o ../hyp-entry.o ../exception.o ../pgtable.o hyp-obj-y +=3D ../../../kernel/smccc-call.o hyp-obj-$(CONFIG_LIST_HARDENED) +=3D list_debug.o -hyp-obj-$(CONFIG_NVHE_EL2_TRACING) +=3D clock.o +hyp-obj-$(CONFIG_NVHE_EL2_TRACING) +=3D clock.o trace.o hyp-obj-y +=3D $(lib-objs) =20 +# Path to simple_ring_buffer.c +CFLAGS_trace.nvhe.o +=3D -I$(objtree)/kernel/trace/ + ## ## Build rules for compiling nVHE hyp code ## Output of this folder is `kvm_nvhe.o`, a partially linked object diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/h= yp-main.c index 5559b622ea57..eddbf5df5d13 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -18,6 +18,7 @@ #include #include #include +#include #include =20 DEFINE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params); @@ -587,6 +588,33 @@ static void handle___pkvm_teardown_vm(struct kvm_cpu_c= ontext *host_ctxt) cpu_reg(host_ctxt, 1) =3D __pkvm_teardown_vm(handle); } =20 +static void handle___tracing_load(struct kvm_cpu_context *host_ctxt) +{ + DECLARE_REG(unsigned long, desc_hva, host_ctxt, 1); + DECLARE_REG(size_t, desc_size, host_ctxt, 2); + + cpu_reg(host_ctxt, 1) =3D __tracing_load(desc_hva, desc_size); +} + +static void handle___tracing_unload(struct kvm_cpu_context *host_ctxt) +{ + __tracing_unload(); +} + +static void handle___tracing_enable(struct kvm_cpu_context *host_ctxt) +{ + DECLARE_REG(bool, enable, host_ctxt, 1); + + cpu_reg(host_ctxt, 1) =3D __tracing_enable(enable); +} + +static void handle___tracing_swap_reader(struct kvm_cpu_context *host_ctxt) +{ + DECLARE_REG(unsigned int, cpu, host_ctxt, 1); + + cpu_reg(host_ctxt, 1) =3D __tracing_swap_reader(cpu); +} + typedef void (*hcall_t)(struct kvm_cpu_context *); =20 #define HANDLE_FUNC(x) [__KVM_HOST_SMCCC_FUNC_##x] =3D (hcall_t)handle_##x @@ -628,6 +656,10 @@ static const hcall_t host_hcall[] =3D { HANDLE_FUNC(__pkvm_vcpu_load), HANDLE_FUNC(__pkvm_vcpu_put), HANDLE_FUNC(__pkvm_tlb_flush_vmid), + HANDLE_FUNC(__tracing_load), + HANDLE_FUNC(__tracing_unload), + HANDLE_FUNC(__tracing_enable), + HANDLE_FUNC(__tracing_swap_reader), }; =20 static void handle_host_hcall(struct kvm_cpu_context *host_ctxt) diff --git a/arch/arm64/kvm/hyp/nvhe/trace.c b/arch/arm64/kvm/hyp/nvhe/trac= e.c new file mode 100644 index 000000000000..282cba70ce9b --- /dev/null +++ b/arch/arm64/kvm/hyp/nvhe/trace.c @@ -0,0 +1,273 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2025 Google LLC + * Author: Vincent Donnefort + */ + +#include +#include +#include +#include + +#include +#include +#include + +#include "simple_ring_buffer.c" + +static DEFINE_PER_CPU(struct simple_rb_per_cpu, __simple_rbs); + +static struct hyp_trace_buffer { + struct simple_rb_per_cpu __percpu *simple_rbs; + void *bpages_backing_start; + size_t bpages_backing_size; + hyp_spinlock_t lock; +} trace_buffer =3D { + .simple_rbs =3D &__simple_rbs, + .lock =3D __HYP_SPIN_LOCK_UNLOCKED, +}; + +static bool hyp_trace_buffer_loaded(struct hyp_trace_buffer *trace_buffer) +{ + return trace_buffer->bpages_backing_size > 0; +} + +void *tracing_reserve_entry(unsigned long length) +{ + return simple_ring_buffer_reserve(this_cpu_ptr(trace_buffer.simple_rbs), = length, + trace_clock()); +} + +void tracing_commit_entry(void) +{ + simple_ring_buffer_commit(this_cpu_ptr(trace_buffer.simple_rbs)); +} + +static int __admit_host_mem(void *start, u64 size) +{ + if (!PAGE_ALIGNED(start) || !PAGE_ALIGNED(size) || !size) + return -EINVAL; + + if (!is_protected_kvm_enabled()) + return 0; + + return __pkvm_host_donate_hyp(hyp_virt_to_pfn(start), size >> PAGE_SHIFT); +} + +static void __release_host_mem(void *start, u64 size) +{ + if (!is_protected_kvm_enabled()) + return; + + WARN_ON(__pkvm_hyp_donate_host(hyp_virt_to_pfn(start), size >> PAGE_SHIFT= )); +} + +static int hyp_trace_buffer_load_bpage_backing(struct hyp_trace_buffer *tr= ace_buffer, + struct hyp_trace_desc *desc) +{ + void *start =3D (void *)kern_hyp_va(desc->bpages_backing_start); + size_t size =3D desc->bpages_backing_size; + int ret; + + ret =3D __admit_host_mem(start, size); + if (ret) + return ret; + + memset(start, 0, size); + + trace_buffer->bpages_backing_start =3D start; + trace_buffer->bpages_backing_size =3D size; + + return 0; +} + +static void hyp_trace_buffer_unload_bpage_backing(struct hyp_trace_buffer = *trace_buffer) +{ + void *start =3D trace_buffer->bpages_backing_start; + size_t size =3D trace_buffer->bpages_backing_size; + + if (!size) + return; + + memset(start, 0, size); + + __release_host_mem(start, size); + + trace_buffer->bpages_backing_start =3D 0; + trace_buffer->bpages_backing_size =3D 0; +} + +static void *__pin_shared_page(unsigned long kern_va) +{ + void *va =3D kern_hyp_va((void *)kern_va); + + if (!is_protected_kvm_enabled()) + return va; + + return hyp_pin_shared_mem(va, va + PAGE_SIZE) ? NULL : va; +} + +static void __unpin_shared_page(void *va) +{ + if (!is_protected_kvm_enabled()) + return; + + hyp_unpin_shared_mem(va, va + PAGE_SIZE); +} + +static void hyp_trace_buffer_unload(struct hyp_trace_buffer *trace_buffer) +{ + int cpu; + + hyp_assert_lock_held(&trace_buffer->lock); + + if (!hyp_trace_buffer_loaded(trace_buffer)) + return; + + for (cpu =3D 0; cpu < hyp_nr_cpus; cpu++) + simple_ring_buffer_unload_mm(per_cpu_ptr(trace_buffer->simple_rbs, cpu), + __unpin_shared_page); + + hyp_trace_buffer_unload_bpage_backing(trace_buffer); +} + +static int hyp_trace_buffer_load(struct hyp_trace_buffer *trace_buffer, + struct hyp_trace_desc *desc) +{ + struct simple_buffer_page *bpages; + struct ring_buffer_desc *rb_desc; + int ret, cpu; + + hyp_assert_lock_held(&trace_buffer->lock); + + if (hyp_trace_buffer_loaded(trace_buffer)) + return -EINVAL; + + ret =3D hyp_trace_buffer_load_bpage_backing(trace_buffer, desc); + if (ret) + return ret; + + bpages =3D trace_buffer->bpages_backing_start; + for_each_ring_buffer_desc(rb_desc, cpu, &desc->trace_buffer_desc) { + ret =3D simple_ring_buffer_init_mm(per_cpu_ptr(trace_buffer->simple_rbs,= cpu), + bpages, rb_desc, __pin_shared_page, + __unpin_shared_page); + if (ret) + break; + + bpages +=3D rb_desc->nr_page_va; + } + + if (ret) + hyp_trace_buffer_unload(trace_buffer); + + return ret; +} + +static bool hyp_trace_desc_validate(struct hyp_trace_desc *desc, size_t de= sc_size) +{ + struct ring_buffer_desc *rb_desc; + unsigned int cpu; + size_t nr_bpages; + void *desc_end; + + /* + * Both desc_size and bpages_backing_size are untrusted host-provided + * values. We rely on __pkvm_host_donate_hyp() to enforce their validity. + */ + desc_end =3D (void *)desc + desc_size; + nr_bpages =3D desc->bpages_backing_size / sizeof(struct simple_buffer_pag= e); + + for_each_ring_buffer_desc(rb_desc, cpu, &desc->trace_buffer_desc) { + /* Can we read nr_page_va? */ + if ((void *)rb_desc + struct_size(rb_desc, page_va, 0) > desc_end) + return false; + + /* Overflow desc? */ + if ((void *)rb_desc + struct_size(rb_desc, page_va, rb_desc->nr_page_va)= > desc_end) + return false; + + /* Overflow bpages backing memory? */ + if (nr_bpages < rb_desc->nr_page_va) + return false; + + if (cpu >=3D hyp_nr_cpus) + return false; + + if (cpu !=3D rb_desc->cpu) + return false; + + nr_bpages -=3D rb_desc->nr_page_va; + } + + return true; +} + +int __tracing_load(unsigned long desc_hva, size_t desc_size) +{ + struct hyp_trace_desc *desc =3D (struct hyp_trace_desc *)kern_hyp_va(desc= _hva); + int ret; + + ret =3D __admit_host_mem(desc, desc_size); + if (ret) + return ret; + + if (!hyp_trace_desc_validate(desc, desc_size)) + goto err_release_desc; + + hyp_spin_lock(&trace_buffer.lock); + + ret =3D hyp_trace_buffer_load(&trace_buffer, desc); + + hyp_spin_unlock(&trace_buffer.lock); + +err_release_desc: + __release_host_mem(desc, desc_size); + return ret; +} + +void __tracing_unload(void) +{ + hyp_spin_lock(&trace_buffer.lock); + hyp_trace_buffer_unload(&trace_buffer); + hyp_spin_unlock(&trace_buffer.lock); +} + +int __tracing_enable(bool enable) +{ + int cpu, ret =3D enable ? -EINVAL : 0; + + hyp_spin_lock(&trace_buffer.lock); + + if (!hyp_trace_buffer_loaded(&trace_buffer)) + goto unlock; + + for (cpu =3D 0; cpu < hyp_nr_cpus; cpu++) + simple_ring_buffer_enable_tracing(per_cpu_ptr(trace_buffer.simple_rbs, c= pu), + enable); + + ret =3D 0; + +unlock: + hyp_spin_unlock(&trace_buffer.lock); + + return ret; +} + +int __tracing_swap_reader(unsigned int cpu) +{ + int ret =3D -ENODEV; + + if (cpu >=3D hyp_nr_cpus) + return -EINVAL; + + hyp_spin_lock(&trace_buffer.lock); + + if (hyp_trace_buffer_loaded(&trace_buffer)) + ret =3D simple_ring_buffer_swap_reader_page( + per_cpu_ptr(trace_buffer.simple_rbs, cpu)); + + hyp_spin_unlock(&trace_buffer.lock); + + return ret; +} --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 2026 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.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 2C68627A92E for ; Sat, 31 Jan 2026 13:36:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866592; cv=none; b=BoiLWzRiYC8xDRGAuakCS/WNuSJh6h1YPJltCcGojojgDtz4N8gGQpnLdg+YUVd/yOLTe2j7wa2zuo0wT80vO/7jqCrrqk6uWuAZlWCkHWuJIdEMlgSpbz985sSHpExHERQIQesqGKmJOgR7wLNdMjB5OJxE5IzzNue685GV9GI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866592; c=relaxed/simple; bh=5vbS5B+SSGp40e87Wx7aIvzuzpCX46BiZAhM0ki1lN0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=VXG040NFMnTaAJq/wVqdgovdSV5hNKWjtIlyarXG4hDp/WDYqNlHq8BD7mkdaq+SsUuLfLgDFKktaOALc7WyUr2EzTmuSSQCX6zUtV9ilbTZifI5+XC2BcfiOMwf8QTaSjbUIzlYgOOtB81o6afEQCCmwXDz7NuLSE3zzsLmhPc= 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=fpsUvu+R; arc=none smtp.client-ip=209.85.208.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="fpsUvu+R" Received: by mail-ed1-f74.google.com with SMTP id 4fb4d7f45d1cf-64d251b8c5dso2996787a12.1 for ; Sat, 31 Jan 2026 05:36:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866590; x=1770471390; 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=Vy1oYHc7CtN0iAjwxhYsnDem9gNnyq1Os5+rmoahwrA=; b=fpsUvu+RTdza58JeJnGgSrfY5NFPEK2LgMLklWlFWfwsZTlpN8zET5HNxUJAfyHbk0 CKRjnqybLLUGx7UjGQPqC6eLH89edSkzwGbMNSMYvAfLWZC83brR+26hWPRQKl79XC53 PgLI+I9Xjre9SY+lOHMkL21JmPqzgmavv7Lx7Krbnr1iY4V1AwlqUC0GyRjyBTw8Ar9p YlNYR3jqUmPpe2GEmnaXBm9nnInaglqs+DojNN/0vCllrB1+jGXZcQpOtZ2IG9FWiC4D Y4oolTScbGAZAIw3zR4RlkFvZ00FAyUHAO+yldumSYpt99K31bqSq++QWwzN5P+AcEqk YJVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866590; x=1770471390; 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=Vy1oYHc7CtN0iAjwxhYsnDem9gNnyq1Os5+rmoahwrA=; b=HJF0sqwKxU7MQoovYTcBUU2iwy9z/RwoUPmksAMp0gHy1wIC/Di8TPYF0H9jDzMEn5 vrFH+wy6cf/zRIiccIR7L6eq6iZbZtwiI1qVxtIlh4LwPqcv3GIFxLyYtwA1EHytDzAU htXJ6axlDE8/SSLP0Hr3Gs4Z95UcLR4v0MTLh21DwA8E9TdcEDh3XLVrMfA09APYYxxW MmhRSKNjdTSBmf5PXrz1vCxjlULdVHSFmUK+3eexPO2CW15ow8U2LcGjQSuJb/xJBLp5 OUiundv2V0XNm4JT9XN1SkO3kox+sJjl/gOdEKFhk1VCqoMvfY4SOY3VG49EqIOuGoy+ +w3A== X-Forwarded-Encrypted: i=1; AJvYcCXXdtGLfexr/Z8Jr8BZQGLxbLWwCEHzzU+F0Eq3X1a9L5br6n1K5134p7VvNFMmQuMttF5vb2Gj/IfVtWo=@vger.kernel.org X-Gm-Message-State: AOJu0YwnECz6++2ZFUIHesRCLsUTjtzUkxcbbdApoLl4mGJTz8RrMb9l 985sstUNoXh/zB+817pjFjuitoUJYmudMfjYg3QU/4iYG5w3CAucDFrtfIbAZoObR9yZHvnq+0G JEODIEcvTOtBMep+3NWF3vA== X-Received: from edqd7.prod.google.com ([2002:a50:fb07:0:b0:655:47ed:274d]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:27cd:b0:658:b46c:ef7f with SMTP id 4fb4d7f45d1cf-658de55896fmr3610330a12.8.1769866184185; Sat, 31 Jan 2026 05:29:44 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:42 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-25-vdonnefort@google.com> Subject: [PATCH v11 24/30] KVM: arm64: Add trace remote for the nVHE/pKVM hyp From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In both protected and nVHE mode, the hypervisor is capable of writing events into tracefs compatible ring-buffers. Create a trace remote so the kernel can read those buffers. This currently doesn't provide any event support which will come later. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index c7f50492f2cf..aad0228f24db 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -76,6 +76,7 @@ if NVHE_EL2_DEBUG config NVHE_EL2_TRACING bool depends on TRACING + select TRACE_REMOTE default y =20 config PKVM_DISABLE_STAGE2_ON_PANIC diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile index 3ebc0570345c..59612d2f277c 100644 --- a/arch/arm64/kvm/Makefile +++ b/arch/arm64/kvm/Makefile @@ -30,6 +30,8 @@ kvm-$(CONFIG_HW_PERF_EVENTS) +=3D pmu-emul.o pmu.o kvm-$(CONFIG_ARM64_PTR_AUTH) +=3D pauth.o kvm-$(CONFIG_PTDUMP_STAGE2_DEBUGFS) +=3D ptdump.o =20 +kvm-$(CONFIG_NVHE_EL2_TRACING) +=3D hyp_trace.o + always-y :=3D hyp_constants.h hyp-constants.s =20 define rule_gen_hyp_constants diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index be1fd6c5f74c..f7f222ecaf88 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -24,6 +24,7 @@ =20 #define CREATE_TRACE_POINTS #include "trace_arm.h" +#include "hyp_trace.h" =20 #include #include @@ -2361,6 +2362,10 @@ static int __init init_subsystems(void) =20 kvm_register_perf_callbacks(NULL); =20 + err =3D kvm_hyp_trace_init(); + if (err) + kvm_err("Failed to initialize Hyp tracing\n"); + out: if (err) hyp_cpu_pm_exit(); diff --git a/arch/arm64/kvm/hyp_trace.c b/arch/arm64/kvm/hyp_trace.c new file mode 100644 index 000000000000..2866effe28ec --- /dev/null +++ b/arch/arm64/kvm/hyp_trace.c @@ -0,0 +1,219 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2025 Google LLC + * Author: Vincent Donnefort + */ + +#include +#include + +#include +#include +#include + +#include "hyp_trace.h" + +/* Access to this struct within the trace_remote_callbacks are protected b= y the trace_remote lock */ +static struct hyp_trace_buffer { + struct hyp_trace_desc *desc; + size_t desc_size; +} trace_buffer; + +static int __map_hyp(void *start, size_t size) +{ + if (is_protected_kvm_enabled()) + return 0; + + return create_hyp_mappings(start, start + size, PAGE_HYP); +} + +static int __share_page(unsigned long va) +{ + return kvm_share_hyp((void *)va, (void *)va + 1); +} + +static void __unshare_page(unsigned long va) +{ + kvm_unshare_hyp((void *)va, (void *)va + 1); +} + +static int hyp_trace_buffer_alloc_bpages_backing(struct hyp_trace_buffer *= trace_buffer, size_t size) +{ + int nr_bpages =3D (PAGE_ALIGN(size) / PAGE_SIZE) + 1; + size_t backing_size; + void *start; + + backing_size =3D PAGE_ALIGN(sizeof(struct simple_buffer_page) * nr_bpages= * + num_possible_cpus()); + + start =3D alloc_pages_exact(backing_size, GFP_KERNEL_ACCOUNT); + if (!start) + return -ENOMEM; + + trace_buffer->desc->bpages_backing_start =3D (unsigned long)start; + trace_buffer->desc->bpages_backing_size =3D backing_size; + + return __map_hyp(start, backing_size); +} + +static void hyp_trace_buffer_free_bpages_backing(struct hyp_trace_buffer *= trace_buffer) +{ + free_pages_exact((void *)trace_buffer->desc->bpages_backing_start, + trace_buffer->desc->bpages_backing_size); +} + +static void hyp_trace_buffer_unshare_hyp(struct hyp_trace_buffer *trace_bu= ffer, int last_cpu) +{ + struct ring_buffer_desc *rb_desc; + int cpu, p; + + for_each_ring_buffer_desc(rb_desc, cpu, &trace_buffer->desc->trace_buffer= _desc) { + if (cpu > last_cpu) + break; + + __share_page(rb_desc->meta_va); + for (p =3D 0; p < rb_desc->nr_page_va; p++) + __unshare_page(rb_desc->page_va[p]); + } +} + +static int hyp_trace_buffer_share_hyp(struct hyp_trace_buffer *trace_buffe= r) +{ + struct ring_buffer_desc *rb_desc; + int cpu, p, ret =3D 0; + + for_each_ring_buffer_desc(rb_desc, cpu, &trace_buffer->desc->trace_buffer= _desc) { + ret =3D __share_page(rb_desc->meta_va); + if (ret) + break; + + for (p =3D 0; p < rb_desc->nr_page_va; p++) { + ret =3D __share_page(rb_desc->page_va[p]); + if (ret) + break; + } + + if (ret) { + for (p--; p >=3D 0; p--) + __unshare_page(rb_desc->page_va[p]); + break; + } + } + + if (ret) + hyp_trace_buffer_unshare_hyp(trace_buffer, cpu--); + + return ret; +} + +static struct trace_buffer_desc *hyp_trace_load(unsigned long size, void *= priv) +{ + struct hyp_trace_buffer *trace_buffer =3D priv; + struct hyp_trace_desc *desc; + size_t desc_size; + int ret; + + if (WARN_ON(trace_buffer->desc)) + return ERR_PTR(-EINVAL); + + desc_size =3D trace_buffer_desc_size(size, num_possible_cpus()); + if (desc_size =3D=3D SIZE_MAX) + return ERR_PTR(-E2BIG); + + desc_size =3D PAGE_ALIGN(desc_size); + desc =3D (struct hyp_trace_desc *)alloc_pages_exact(desc_size, GFP_KERNEL= ); + if (!desc) + return ERR_PTR(-ENOMEM); + + ret =3D __map_hyp(desc, desc_size); + if (ret) + goto err_free_desc; + + trace_buffer->desc =3D desc; + + ret =3D hyp_trace_buffer_alloc_bpages_backing(trace_buffer, size); + if (ret) + goto err_free_desc; + + ret =3D trace_remote_alloc_buffer(&desc->trace_buffer_desc, desc_size, si= ze, + cpu_possible_mask); + if (ret) + goto err_free_backing; + + ret =3D hyp_trace_buffer_share_hyp(trace_buffer); + if (ret) + goto err_free_buffer; + + ret =3D kvm_call_hyp_nvhe(__tracing_load, (unsigned long)desc, desc_size); + if (ret) + goto err_unload_pages; + + return &desc->trace_buffer_desc; + +err_unload_pages: + hyp_trace_buffer_unshare_hyp(trace_buffer, INT_MAX); + +err_free_buffer: + trace_remote_free_buffer(&desc->trace_buffer_desc); + +err_free_backing: + hyp_trace_buffer_free_bpages_backing(trace_buffer); + +err_free_desc: + free_pages_exact(desc, desc_size); + trace_buffer->desc =3D NULL; + + return ERR_PTR(ret); +} + +static void hyp_trace_unload(struct trace_buffer_desc *desc, void *priv) +{ + struct hyp_trace_buffer *trace_buffer =3D priv; + + if (WARN_ON(desc !=3D &trace_buffer->desc->trace_buffer_desc)) + return; + + kvm_call_hyp_nvhe(__tracing_unload); + hyp_trace_buffer_unshare_hyp(trace_buffer, INT_MAX); + trace_remote_free_buffer(desc); + hyp_trace_buffer_free_bpages_backing(trace_buffer); + free_pages_exact(trace_buffer->desc, trace_buffer->desc_size); + trace_buffer->desc =3D NULL; +} + +static int hyp_trace_enable_tracing(bool enable, void *priv) +{ + return kvm_call_hyp_nvhe(__tracing_enable, enable); +} + +static int hyp_trace_swap_reader_page(unsigned int cpu, void *priv) +{ + return kvm_call_hyp_nvhe(__tracing_swap_reader, cpu); +} + +static int hyp_trace_reset(unsigned int cpu, void *priv) +{ + return 0; +} + +static int hyp_trace_enable_event(unsigned short id, bool enable, void *pr= iv) +{ + return 0; +} + +static struct trace_remote_callbacks trace_remote_callbacks =3D { + .load_trace_buffer =3D hyp_trace_load, + .unload_trace_buffer =3D hyp_trace_unload, + .enable_tracing =3D hyp_trace_enable_tracing, + .swap_reader_page =3D hyp_trace_swap_reader_page, + .reset =3D hyp_trace_reset, + .enable_event =3D hyp_trace_enable_event, +}; + +int __init kvm_hyp_trace_init(void) +{ + if (is_kernel_in_hyp_mode()) + return 0; + + return trace_remote_register("hypervisor", &trace_remote_callbacks, &trac= e_buffer, NULL, 0); +} diff --git a/arch/arm64/kvm/hyp_trace.h b/arch/arm64/kvm/hyp_trace.h new file mode 100644 index 000000000000..c991b1ec65f1 --- /dev/null +++ b/arch/arm64/kvm/hyp_trace.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ARM64_KVM_HYP_TRACE_H__ +#define __ARM64_KVM_HYP_TRACE_H__ + +#ifdef CONFIG_NVHE_EL2_TRACING +int kvm_hyp_trace_init(void); +#else +static inline int kvm_hyp_trace_init(void) { return 0; } +#endif +#endif --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 C88D935CBBE for ; Sat, 31 Jan 2026 13:29:46 +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=1769866189; cv=none; b=k/DTJpFH4z0AnBcZ07LZcY8tkJKQnUDflKgeo7bR7rpkOUxYB42b9qkPJV62IC3fAgclwzGRTgjJVXPvrz9jiBprRtNdRYSIfAVc778rAuGwV/Q4u//SmTcy06+2oX4juCK7iCbuyKlY40oZQjiOm+5KifmyrAeWeXJPt1Zc5eU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866189; c=relaxed/simple; bh=2AilXay0Gb7/8eApDJ0W5cWvG/B3GZHcnyhcU/o3BjU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=FKsuYaaaQTQZCq6klF29ZjGgzyFWNrZeun6HtSP2nX6/M5ye7NJRaJYx0qQJMOyNvg1nqWyOCaphtSEpWtcHl31NvJKehI0GutAOQd6Epl0nmkJDTOsSZEbADvOCkoUxqRtNKUH+MzjD2r2/bzwVzv5w9UEnkFMD7qH+rqrgWjk= 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=S2Q1q2fS; 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="S2Q1q2fS" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-47d4029340aso52913975e9.3 for ; Sat, 31 Jan 2026 05:29:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866185; x=1770470985; 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=M+GkdGsUgu4Q8sQp/aQtvPYhjbJoPPZSMXXtWDkMc54=; b=S2Q1q2fSnFwxHtCAEM1Lo/yoBqYTNqvu1Xif0BWuZrvcGsxOgba7e1RZ8LNHft3YEg CxFlHy/QqbsysoHU8yqHxSiaE1kXbor80OLuStAvwJmMxDXn9PF2Fr88ZsstHM+bki54 SPXkioWxbP7Yk3+M+LAIaSzaOdKrvESviGNw7O2sWl92U/KFxQFNoo/KANgqRU+y3N60 DIgdtfZdT1DGLRewtxJf2rfB9ubJd2Js7tmJazNgJEeTUBRkoPuZApV9RbazQn9gksDc W7NBU3XH1SZfJELocXjSOeRh+HvdZaD55VTRRByRzq02F4qLW+tcpspNhtzfpR/UC6nt OiNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866185; x=1770470985; 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=M+GkdGsUgu4Q8sQp/aQtvPYhjbJoPPZSMXXtWDkMc54=; b=b9GDoJj1Ui+64wTxONHPPXorXz9EsA6/TJnww8rRz0qqBVWB/y4ShoTbkRwTTNqbFR IKgkV52AtHySyf8GCVtcCkV4io7Az6EkU/uu8FyLvrV/HgRvvVVf5IcS7q935P0zEQtz /bs3uYtB9icLkXHuSK535+jntJSLHhfe8MZmgO8ojmoPuYvmkLiIDCwCRLv3KE/eGM3j sBSQ0VbrJWP/VTLQPn5r3KJQKbPbizjCvTnIIQ559SN8gY1lsvr3FE6IkBTLcbczsMqh 3d24bVfFqtynoqytlakJgdF6ytlk033/vC3W3F9jIEG2Kln92WLby1vM6FsJslb1fpwi Y7Gg== X-Forwarded-Encrypted: i=1; AJvYcCXMLLBlqHBk3qCq67JDa/gYykKJYDkQ0uu1XZ19Wcaqir39u4RZa7bhG096Gc+1cqzfrx6zKbMImOxBRi4=@vger.kernel.org X-Gm-Message-State: AOJu0YxKCUB+2m69/He2ln9Pyywr9ZUaiY+8nKYXCVXWPhXldn+zBP6w K4UIIZln1eiCKZKVqMy5wk9I3BZqdfgl+XLZAUaNP5CHu9AAfbdVfxIEWngc8ggKvMzm7ltw85z SsKkFLzTQCuyF9loO5LL+OQ== X-Received: from wmgg16.prod.google.com ([2002:a05:600d:10:b0:47b:20f8:660a]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4ed3:b0:477:a246:8398 with SMTP id 5b1f17b1804b1-482db45929emr83972105e9.2.1769866185313; Sat, 31 Jan 2026 05:29:45 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:43 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-26-vdonnefort@google.com> Subject: [PATCH v11 25/30] KVM: arm64: Sync boot clock with the nVHE/pKVM hyp From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort , Thomas Gleixner , Stephen Boyd , "Christopher S. Hall" , Richard Cochran Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Configure the hypervisor tracing clock with the kernel boot clock. For tracing purposes, the boot clock is interesting: it doesn't stop on suspend. However, it is corrected on a regular basis, which implies the need to re-evaluate it every once in a while. Cc: John Stultz Cc: Thomas Gleixner Cc: Stephen Boyd Cc: Christopher S. Hall Cc: Richard Cochran Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_= asm.h index c3a7fc939f42..352ebbedaab2 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -93,6 +93,7 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___tracing_unload, __KVM_HOST_SMCCC_FUNC___tracing_enable, __KVM_HOST_SMCCC_FUNC___tracing_swap_reader, + __KVM_HOST_SMCCC_FUNC___tracing_update_clock, }; =20 #define DECLARE_KVM_VHE_SYM(sym) extern char sym[] diff --git a/arch/arm64/kvm/hyp/include/nvhe/trace.h b/arch/arm64/kvm/hyp/i= nclude/nvhe/trace.h index 7da8788ce527..fd641e1b1c23 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/trace.h +++ b/arch/arm64/kvm/hyp/include/nvhe/trace.h @@ -11,6 +11,7 @@ int __tracing_load(unsigned long desc_va, size_t desc_siz= e); void __tracing_unload(void); int __tracing_enable(bool enable); int __tracing_swap_reader(unsigned int cpu); +void __tracing_update_clock(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_c= yc); #else static inline void *tracing_reserve_entry(unsigned long length) { return N= ULL; } static inline void tracing_commit_entry(void) { } @@ -19,5 +20,6 @@ static inline int __tracing_load(unsigned long desc_va, s= ize_t desc_size) { retu static inline void __tracing_unload(void) { } static inline int __tracing_enable(bool enable) { return -ENODEV; } static inline int __tracing_swap_reader(unsigned int cpu) { return -ENODEV= ; } +static inline void __tracing_update_clock(u32 mult, u32 shift, u64 epoch_n= s, u64 epoch_cyc) { } #endif #endif diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/h= yp-main.c index eddbf5df5d13..9df0d37a494b 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -615,6 +615,16 @@ static void handle___tracing_swap_reader(struct kvm_cp= u_context *host_ctxt) cpu_reg(host_ctxt, 1) =3D __tracing_swap_reader(cpu); } =20 +static void handle___tracing_update_clock(struct kvm_cpu_context *host_ctx= t) +{ + DECLARE_REG(u32, mult, host_ctxt, 1); + DECLARE_REG(u32, shift, host_ctxt, 2); + DECLARE_REG(u64, epoch_ns, host_ctxt, 3); + DECLARE_REG(u64, epoch_cyc, host_ctxt, 4); + + __tracing_update_clock(mult, shift, epoch_ns, epoch_cyc); +} + typedef void (*hcall_t)(struct kvm_cpu_context *); =20 #define HANDLE_FUNC(x) [__KVM_HOST_SMCCC_FUNC_##x] =3D (hcall_t)handle_##x @@ -660,6 +670,7 @@ static const hcall_t host_hcall[] =3D { HANDLE_FUNC(__tracing_unload), HANDLE_FUNC(__tracing_enable), HANDLE_FUNC(__tracing_swap_reader), + HANDLE_FUNC(__tracing_update_clock), }; =20 static void handle_host_hcall(struct kvm_cpu_context *host_ctxt) diff --git a/arch/arm64/kvm/hyp/nvhe/trace.c b/arch/arm64/kvm/hyp/nvhe/trac= e.c index 282cba70ce9b..2c8e6f49d7de 100644 --- a/arch/arm64/kvm/hyp/nvhe/trace.c +++ b/arch/arm64/kvm/hyp/nvhe/trace.c @@ -271,3 +271,19 @@ int __tracing_swap_reader(unsigned int cpu) =20 return ret; } + +void __tracing_update_clock(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_c= yc) +{ + int cpu; + + /* After this loop, all CPUs are observing the new bank... */ + for (cpu =3D 0; cpu < hyp_nr_cpus; cpu++) { + struct simple_rb_per_cpu *simple_rb =3D per_cpu_ptr(trace_buffer.simple_= rbs, cpu); + + while (READ_ONCE(simple_rb->status) =3D=3D SIMPLE_RB_WRITING) + ; + } + + /* ...we can now override the old one and swap. */ + trace_clock_update(mult, shift, epoch_ns, epoch_cyc); +} diff --git a/arch/arm64/kvm/hyp_trace.c b/arch/arm64/kvm/hyp_trace.c index 2866effe28ec..1e5fc27f0e9d 100644 --- a/arch/arm64/kvm/hyp_trace.c +++ b/arch/arm64/kvm/hyp_trace.c @@ -4,15 +4,133 @@ * Author: Vincent Donnefort */ =20 +#include #include +#include #include =20 +#include #include #include #include =20 #include "hyp_trace.h" =20 +/* Same 10min used by clocksource when width is more than 32-bits */ +#define CLOCK_MAX_CONVERSION_S 600 +/* + * Time to give for the clock init. Long enough to get a good mult/shift + * estimation. Short enough to not delay the tracing start too much. + */ +#define CLOCK_INIT_MS 100 +/* + * Time between clock checks. Must be small enough to catch clock deviatio= n when + * it is still tiny. + */ +#define CLOCK_UPDATE_MS 500 + +static struct hyp_trace_clock { + u64 cycles; + u64 cyc_overflow64; + u64 boot; + u32 mult; + u32 shift; + struct delayed_work work; + struct completion ready; + struct mutex lock; + bool running; +} hyp_clock; + +static void __hyp_clock_work(struct work_struct *work) +{ + struct delayed_work *dwork =3D to_delayed_work(work); + struct hyp_trace_clock *hyp_clock; + struct system_time_snapshot snap; + u64 rate, delta_cycles; + u64 boot, delta_boot; + + hyp_clock =3D container_of(dwork, struct hyp_trace_clock, work); + + ktime_get_snapshot(&snap); + boot =3D ktime_to_ns(snap.boot); + + delta_boot =3D boot - hyp_clock->boot; + delta_cycles =3D snap.cycles - hyp_clock->cycles; + + /* Compare hyp clock with the kernel boot clock */ + if (hyp_clock->mult) { + u64 err, cur =3D delta_cycles; + + if (WARN_ON_ONCE(cur >=3D hyp_clock->cyc_overflow64)) { + __uint128_t tmp =3D (__uint128_t)cur * hyp_clock->mult; + + cur =3D tmp >> hyp_clock->shift; + } else { + cur *=3D hyp_clock->mult; + cur >>=3D hyp_clock->shift; + } + cur +=3D hyp_clock->boot; + + err =3D abs_diff(cur, boot); + /* No deviation, only update epoch if necessary */ + if (!err) { + if (delta_cycles >=3D (hyp_clock->cyc_overflow64 >> 1)) + goto fast_forward; + + goto resched; + } + + /* Warn if the error is above tracing precision (1us) */ + if (err > NSEC_PER_USEC) + pr_warn_ratelimited("hyp trace clock off by %lluus\n", + err / NSEC_PER_USEC); + } + + rate =3D div64_u64(delta_cycles * NSEC_PER_SEC, delta_boot); + + clocks_calc_mult_shift(&hyp_clock->mult, &hyp_clock->shift, + rate, NSEC_PER_SEC, CLOCK_MAX_CONVERSION_S); + + /* Add a comfortable 50% margin */ + hyp_clock->cyc_overflow64 =3D (U64_MAX / hyp_clock->mult) >> 1; + +fast_forward: + hyp_clock->cycles =3D snap.cycles; + hyp_clock->boot =3D boot; + kvm_call_hyp_nvhe(__tracing_update_clock, hyp_clock->mult, + hyp_clock->shift, hyp_clock->boot, hyp_clock->cycles); + complete(&hyp_clock->ready); + +resched: + schedule_delayed_work(&hyp_clock->work, + msecs_to_jiffies(CLOCK_UPDATE_MS)); +} + +static void hyp_trace_clock_enable(struct hyp_trace_clock *hyp_clock, bool= enable) +{ + struct system_time_snapshot snap; + + if (hyp_clock->running =3D=3D enable) + return; + + if (!enable) { + cancel_delayed_work_sync(&hyp_clock->work); + hyp_clock->running =3D false; + } + + ktime_get_snapshot(&snap); + + hyp_clock->boot =3D ktime_to_ns(snap.boot); + hyp_clock->cycles =3D snap.cycles; + hyp_clock->mult =3D 0; + + init_completion(&hyp_clock->ready); + INIT_DELAYED_WORK(&hyp_clock->work, __hyp_clock_work); + schedule_delayed_work(&hyp_clock->work, msecs_to_jiffies(CLOCK_INIT_MS)); + wait_for_completion(&hyp_clock->ready); + hyp_clock->running =3D true; +} + /* Access to this struct within the trace_remote_callbacks are protected b= y the trace_remote lock */ static struct hyp_trace_buffer { struct hyp_trace_desc *desc; @@ -183,6 +301,8 @@ static void hyp_trace_unload(struct trace_buffer_desc *= desc, void *priv) =20 static int hyp_trace_enable_tracing(bool enable, void *priv) { + hyp_trace_clock_enable(&hyp_clock, enable); + return kvm_call_hyp_nvhe(__tracing_enable, enable); } =20 @@ -201,7 +321,22 @@ static int hyp_trace_enable_event(unsigned short id, b= ool enable, void *priv) return 0; } =20 +static int hyp_trace_clock_show(struct seq_file *m, void *v) +{ + seq_puts(m, "[boot]\n"); + + return 0; +} +DEFINE_SHOW_ATTRIBUTE(hyp_trace_clock); + +static int hyp_trace_init_tracefs(struct dentry *d, void *priv) +{ + return tracefs_create_file("trace_clock", 0440, d, NULL, &hyp_trace_clock= _fops) ? + 0 : -ENOMEM; +} + static struct trace_remote_callbacks trace_remote_callbacks =3D { + .init =3D hyp_trace_init_tracefs, .load_trace_buffer =3D hyp_trace_load, .unload_trace_buffer =3D hyp_trace_unload, .enable_tracing =3D hyp_trace_enable_tracing, @@ -212,8 +347,22 @@ static struct trace_remote_callbacks trace_remote_call= backs =3D { =20 int __init kvm_hyp_trace_init(void) { + int cpu; + if (is_kernel_in_hyp_mode()) return 0; =20 +#ifdef CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND + for_each_possible_cpu(cpu) { + const struct arch_timer_erratum_workaround *wa =3D + per_cpu(timer_unstable_counter_workaround, cpu); + + if (wa && wa->read_cntvct_el0) { + pr_warn("hyp trace can't handle CNTVCT workaround '%s'\n", wa->desc); + return -EOPNOTSUPP; + } + } +#endif + return trace_remote_register("hypervisor", &trace_remote_callbacks, &trac= e_buffer, NULL, 0); } --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 2026 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.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 67280354ACE for ; Sat, 31 Jan 2026 13:29:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866191; cv=none; b=gJRBbKKk6cZ63exDRB3qgaMoRzeWtTxdT8KpU/wkfNJQ9NNcWVyVAj7zwmt54xCT9tAjFGhQu1xHBO2a1M5XtrfHU7sv65IxTcx0RmiSXWN81j83RqDtMIRD531Vw4Nb0k5cAYp7HmDqCWDcmBeHdAER8h0sgct+fxiFgSZZXsM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866191; c=relaxed/simple; bh=bVsSvNIxRvkfjgEZMc4BHM6toYEjCu9hVcCZBW789dk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ppUGvbNxnI/cHtr+fFhZwZ65XLo09hxTVvrfYLgwPMMK6bEX0V05q+IQM0HUo4kIno5Xpqhn3q9+X6VzskcCWtwMof8DxigHXzV54bpGScGVufvX/6+KL2HlXdwmDRLpqo6IHCjl2r1Syrd3Nhy3hMs7vbl1GZK3cBQMZeHQKmU= 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=o8fNKLqt; arc=none smtp.client-ip=209.85.208.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="o8fNKLqt" Received: by mail-ed1-f74.google.com with SMTP id 4fb4d7f45d1cf-64b7907dd42so4477364a12.3 for ; Sat, 31 Jan 2026 05:29:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866186; x=1770470986; 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=klNtZXITSNnjVXJK4UiBawa/P+I9Z7pdBnip+Ybnk/g=; b=o8fNKLqtevuMmLo1/O4vcbgTAQsgMD9vqyP/yqzio5OLircO8OUmwo7tzHT5dSUSkY hbYmTmz+Wp7l01trWpjoq3zKhE77PN8Tx+B2ECHiA5LoZF6+yGwZ5Jf/Z7RfuXsdJSCW cHvs0dxweQgeqbBWmJxDGIZGsr0xc5DbkxYwjMVEra0XdqDE8dV33t/Zc2utKox5FGIC uXFzPXRsZ3UBmkvm3upW48O60N49iiiv6xJNwM7H2gFWYgCPmhKIpCUW2E7Zl1ok6rNS Z0YmzHpFsyZfbMmPqrZ6v1VBl4yyJ+pWaNhOvrDbW0lHtrhg39sGXxjaNMB+HBV6QOZy QnTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866186; x=1770470986; 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=klNtZXITSNnjVXJK4UiBawa/P+I9Z7pdBnip+Ybnk/g=; b=BZfxaF7JADAB90QpCldYDekolh68TzEIix3Kt1c+mZcdlQoNXOZTZTZRm6mgTUP5eK OlowL9eM9o78NulfApZ2Twv2PdWVyMoxs0yLVMRrnWwE+kygCAem13dmaBOp2AkVICFJ eDWNeCIRhIW1KgOR1fCkrwKFWjOdQNuTnGKBaoApcHjsoRE1RX4E0ireq3L0y4DeqPWj ZR3WbbyDU5lPIx+ffAhgqC64u61bq6vX7D18P978zcSrwk4Oi3qGuIgx2LarEk9XbJl3 DnRmihpdWFd3AgU88UVV8eJ4E3Ls4AnBzDb5bYzPdeorzUsdhiDqMEQWevZ/dzpaIk/D Zj2w== X-Forwarded-Encrypted: i=1; AJvYcCVSpn2/5ztpMT6cYWTLEhE74RsJvsUouvdIQpvpaHNIL49YC0TOZ5ux/swfUCpt4qtkC6T2OWv3CYftQaI=@vger.kernel.org X-Gm-Message-State: AOJu0YzkD3MgWSd9xNsUVItdouYqgqiE4cGihTInVLVSWBxRHhIaotqP Ptxh37R1fjJu3aAAea9Yj+PI39aO6lxG9Mn+iLoBpv0BUgMzloSueV1kVFIZOjJ3GkOggFbZJrX ab8WZ0lp7fX//PG14IosHcg== X-Received: from ejbze20.prod.google.com ([2002:a17:906:ef94:b0:b73:9000:7e99]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:3c92:b0:b87:225f:2e74 with SMTP id a640c23a62f3a-b8dff5dbcbbmr368357266b.14.1769866186355; Sat, 31 Jan 2026 05:29:46 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:44 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-27-vdonnefort@google.com> Subject: [PATCH v11 26/30] KVM: arm64: Add trace reset to the nVHE/pKVM hyp From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make the hypervisor reset either the whole tracing buffer or a specific ring-buffer, on remotes/hypervisor/trace or per_cpu//trace write access. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_= asm.h index 352ebbedaab2..c5cb2adde7ed 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -94,6 +94,7 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___tracing_enable, __KVM_HOST_SMCCC_FUNC___tracing_swap_reader, __KVM_HOST_SMCCC_FUNC___tracing_update_clock, + __KVM_HOST_SMCCC_FUNC___tracing_reset, }; =20 #define DECLARE_KVM_VHE_SYM(sym) extern char sym[] diff --git a/arch/arm64/kvm/hyp/include/nvhe/trace.h b/arch/arm64/kvm/hyp/i= nclude/nvhe/trace.h index fd641e1b1c23..44912869d184 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/trace.h +++ b/arch/arm64/kvm/hyp/include/nvhe/trace.h @@ -12,6 +12,7 @@ void __tracing_unload(void); int __tracing_enable(bool enable); int __tracing_swap_reader(unsigned int cpu); void __tracing_update_clock(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_c= yc); +int __tracing_reset(unsigned int cpu); #else static inline void *tracing_reserve_entry(unsigned long length) { return N= ULL; } static inline void tracing_commit_entry(void) { } @@ -21,5 +22,6 @@ static inline void __tracing_unload(void) { } static inline int __tracing_enable(bool enable) { return -ENODEV; } static inline int __tracing_swap_reader(unsigned int cpu) { return -ENODEV= ; } static inline void __tracing_update_clock(u32 mult, u32 shift, u64 epoch_n= s, u64 epoch_cyc) { } +static inline int __tracing_reset(unsigned int cpu) { return -ENODEV; } #endif #endif diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/h= yp-main.c index 9df0d37a494b..5acbd451efbd 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -625,6 +625,13 @@ static void handle___tracing_update_clock(struct kvm_c= pu_context *host_ctxt) __tracing_update_clock(mult, shift, epoch_ns, epoch_cyc); } =20 +static void handle___tracing_reset(struct kvm_cpu_context *host_ctxt) +{ + DECLARE_REG(unsigned int, cpu, host_ctxt, 1); + + cpu_reg(host_ctxt, 1) =3D __tracing_reset(cpu); +} + typedef void (*hcall_t)(struct kvm_cpu_context *); =20 #define HANDLE_FUNC(x) [__KVM_HOST_SMCCC_FUNC_##x] =3D (hcall_t)handle_##x @@ -671,6 +678,7 @@ static const hcall_t host_hcall[] =3D { HANDLE_FUNC(__tracing_enable), HANDLE_FUNC(__tracing_swap_reader), HANDLE_FUNC(__tracing_update_clock), + HANDLE_FUNC(__tracing_reset), }; =20 static void handle_host_hcall(struct kvm_cpu_context *host_ctxt) diff --git a/arch/arm64/kvm/hyp/nvhe/trace.c b/arch/arm64/kvm/hyp/nvhe/trac= e.c index 2c8e6f49d7de..a6ca27b18e15 100644 --- a/arch/arm64/kvm/hyp/nvhe/trace.c +++ b/arch/arm64/kvm/hyp/nvhe/trace.c @@ -287,3 +287,20 @@ void __tracing_update_clock(u32 mult, u32 shift, u64 e= poch_ns, u64 epoch_cyc) /* ...we can now override the old one and swap. */ trace_clock_update(mult, shift, epoch_ns, epoch_cyc); } + +int __tracing_reset(unsigned int cpu) +{ + int ret =3D -ENODEV; + + if (cpu >=3D hyp_nr_cpus) + return -EINVAL; + + hyp_spin_lock(&trace_buffer.lock); + + if (hyp_trace_buffer_loaded(&trace_buffer)) + ret =3D simple_ring_buffer_reset(per_cpu_ptr(trace_buffer.simple_rbs, cp= u)); + + hyp_spin_unlock(&trace_buffer.lock); + + return ret; +} diff --git a/arch/arm64/kvm/hyp_trace.c b/arch/arm64/kvm/hyp_trace.c index 1e5fc27f0e9d..09bc192e3514 100644 --- a/arch/arm64/kvm/hyp_trace.c +++ b/arch/arm64/kvm/hyp_trace.c @@ -313,7 +313,7 @@ static int hyp_trace_swap_reader_page(unsigned int cpu,= void *priv) =20 static int hyp_trace_reset(unsigned int cpu, void *priv) { - return 0; + return kvm_call_hyp_nvhe(__tracing_reset, cpu); } =20 static int hyp_trace_enable_event(unsigned short id, bool enable, void *pr= iv) --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 2AC0D357704 for ; Sat, 31 Jan 2026 13:29:49 +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=1769866192; cv=none; b=WEXOYiMYnW8DWY58FU+WBXVkMDVsRivvNy3rB6fsr6EnGnGTXf+qmP+/5JxF0nXF9OopMGyUh4UWhGNur1ebWS+eH1ZH++okZGWn8iR3K4vysDYKPbgWsnZCeaQ9qdCT0sQ9T2VHwWf6hGRkZUvtLiQXYTa5OqLeD9Bo0iY8kZA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866192; c=relaxed/simple; bh=IhSG4TGpLvj4KcKLUhA38Fz2DZoMRpgjx7AZN4BBvrI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=RaT6LXfTzSXVEQzG7ka/P1mT84m83RjqCvK+iuK3tuZpKHZZbc5l4MNARGFzCjYiF4STSPa+JOK3messUvBihVljBY4drkSHaIJnL0ij76XTjxWhrKbtmZ0qkEMAxVfffcTKXrzTkbLTpEHCqml5h5BE5Xou73aZxTYANRqEcNU= 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=mIVDGLZa; 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="mIVDGLZa" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4806fc58fa5so27440645e9.2 for ; Sat, 31 Jan 2026 05:29:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866187; x=1770470987; 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=1KYcw22+QTCEg8xy+ARjFr7wE/gMF/1kiI0/m3iTF5Y=; b=mIVDGLZa1kowgYAz5ru2LktcIpy2mSegA1E3CuZlrwLMcL8uMDYXtXWOk7Dp812bsJ rAKjdJpPNIp1ZgvMFdOpBOxDd9KElDHq8gkJaZg55yYGfIm1uwzf4L/0lQ099rB3pLSe p5Sa24LtLYLL7/5dBW6OCYodvPolBx01jgAKtLHwyoBsa2KPDhTGxH0NVk5pnaJLWDJE qAS1uXW5AjQ3t8iP+o5yZ/tHCB64fRBQUWBj2vhioZjb2UpMZsZMDYUzaFb4d7s1xhhQ c1Ww1/lFWC2bn6nQUpuHEODVMadV+nRjuXYjx8FDxgwwdFXFhjkG0F6EHU2yx/FqNokG U4rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866187; x=1770470987; 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=1KYcw22+QTCEg8xy+ARjFr7wE/gMF/1kiI0/m3iTF5Y=; b=fp5G5/0ltvfcN4zQlLdb4ExIEdjsfp1buhhmXs0u4CgMA2PQR/ARBfXnGUKkzzizzo HdSDFL3XHAwcLIQ0ZEZaxHr0YKlmvr8m+UJYgNPZ72PCiq6J6bZoPAE9dj0PNTiZo4kZ tTSgGWJvy4VzmIrt88/2bRZFDd9DsmEl64/2t6yQhbfE1poQmNXGcJAhZhqk854f2yU2 79SIaveW+zab3+DU7f1YvGQY5bxdSxBBIk+k6CITBIudscirYVdYLphCNT1kDh+ogyDT VAsD1BHg92NhwK3ADSXtMhMG911lCqDjDXZEHZt9YpODqoURX4LQOJTFiNd5+qwM6iGJ kSCQ== X-Forwarded-Encrypted: i=1; AJvYcCX4hIqu07LAUCuQN+VDSFVwsWfosxsu704EUlRfGR8hkk7Mbz6sTeC9+tYj6hHB0X+495QGKotu+urjXnA=@vger.kernel.org X-Gm-Message-State: AOJu0YyiZGtoAw/nA/z4eWbtTOsJvL4RM2MNFCTZ0KFlLQU1b2rFILta 5pWPxCXHnw2HAEzzAbtbUeidfM5wu8e7MervmPliseuxxoI88ga7gEtY16VFFtHrTypb6zWSlug 1gKLBNKP7FryKLQMTvYPWWA== X-Received: from wmqo20.prod.google.com ([2002:a05:600c:4fd4:b0:480:4a03:7b63]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3148:b0:47a:935f:618e with SMTP id 5b1f17b1804b1-482db45ce3amr71234105e9.15.1769866187206; Sat, 31 Jan 2026 05:29:47 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:45 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-28-vdonnefort@google.com> Subject: [PATCH v11 27/30] KVM: arm64: Add event support to the nVHE/pKVM hyp and trace remote From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Allow the creation of hypervisor and trace remote events with a single macro HYP_EVENT(). That macro expands in the kernel side to add all the required declarations (based on REMOTE_EVENT()) as well as in the hypervisor side to create the trace_() function. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_= asm.h index c5cb2adde7ed..f8fa556ec3e1 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -95,6 +95,7 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___tracing_swap_reader, __KVM_HOST_SMCCC_FUNC___tracing_update_clock, __KVM_HOST_SMCCC_FUNC___tracing_reset, + __KVM_HOST_SMCCC_FUNC___tracing_enable_event, }; =20 #define DECLARE_KVM_VHE_SYM(sym) extern char sym[] diff --git a/arch/arm64/include/asm/kvm_define_hypevents.h b/arch/arm64/inc= lude/asm/kvm_define_hypevents.h new file mode 100644 index 000000000000..77d6790252a6 --- /dev/null +++ b/arch/arm64/include/asm/kvm_define_hypevents.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#define REMOTE_EVENT_INCLUDE_FILE arch/arm64/include/asm/kvm_hypevents.h + +#define REMOTE_EVENT_SECTION "_hyp_events" + +#define HE_STRUCT(__args) __args +#define HE_PRINTK(__args...) __args +#define he_field re_field + +#define HYP_EVENT(__name, __proto, __struct, __assign, __printk) \ + REMOTE_EVENT(__name, 0, RE_STRUCT(__struct), RE_PRINTK(__printk)) + +#define HYP_EVENT_MULTI_READ +#include +#undef HYP_EVENT_MULTI_READ diff --git a/arch/arm64/include/asm/kvm_hypevents.h b/arch/arm64/include/as= m/kvm_hypevents.h new file mode 100644 index 000000000000..d6e033c96c52 --- /dev/null +++ b/arch/arm64/include/asm/kvm_hypevents.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#if !defined(__ARM64_KVM_HYPEVENTS_H_) || defined(HYP_EVENT_MULTI_READ) +#define __ARM64_KVM_HYPEVENTS_H_ + +#ifdef __KVM_NVHE_HYPERVISOR__ +#include +#endif + +#endif diff --git a/arch/arm64/include/asm/kvm_hyptrace.h b/arch/arm64/include/asm= /kvm_hyptrace.h index 9c30a479bc36..de133b735f72 100644 --- a/arch/arm64/include/asm/kvm_hyptrace.h +++ b/arch/arm64/include/asm/kvm_hyptrace.h @@ -10,4 +10,17 @@ struct hyp_trace_desc { struct trace_buffer_desc trace_buffer_desc; =20 }; + +struct hyp_event_id { + unsigned short id; + atomic_t enabled; +}; + +extern struct remote_event __hyp_events_start[]; +extern struct remote_event __hyp_events_end[]; + +/* hyp_event section used by the hypervisor */ +extern struct hyp_event_id __hyp_event_ids_start[]; +extern struct hyp_event_id __hyp_event_ids_end[]; + #endif diff --git a/arch/arm64/kernel/image-vars.h b/arch/arm64/kernel/image-vars.h index 211f0e2e55e2..4639f92685cb 100644 --- a/arch/arm64/kernel/image-vars.h +++ b/arch/arm64/kernel/image-vars.h @@ -139,6 +139,10 @@ KVM_NVHE_ALIAS(__hyp_data_start); KVM_NVHE_ALIAS(__hyp_data_end); KVM_NVHE_ALIAS(__hyp_rodata_start); KVM_NVHE_ALIAS(__hyp_rodata_end); +#ifdef CONFIG_NVHE_EL2_TRACING +KVM_NVHE_ALIAS(__hyp_event_ids_start); +KVM_NVHE_ALIAS(__hyp_event_ids_end); +#endif =20 /* pKVM static key */ KVM_NVHE_ALIAS(kvm_protected_mode_initialized); diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.ld= s.S index ad6133b89e7a..273a461c6076 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -13,12 +13,23 @@ *(__kvm_ex_table) \ __stop___kvm_ex_table =3D .; =20 +#ifdef CONFIG_NVHE_EL2_TRACING +#define HYPERVISOR_EVENT_IDS \ + . =3D ALIGN(PAGE_SIZE); \ + __hyp_event_ids_start =3D .; \ + *(HYP_SECTION_NAME(.event_ids)) \ + __hyp_event_ids_end =3D .; +#else +#define HYPERVISOR_EVENT_IDS +#endif + #define HYPERVISOR_RODATA_SECTIONS \ HYP_SECTION_NAME(.rodata) : { \ . =3D ALIGN(PAGE_SIZE); \ __hyp_rodata_start =3D .; \ *(HYP_SECTION_NAME(.data..ro_after_init)) \ *(HYP_SECTION_NAME(.rodata)) \ + HYPERVISOR_EVENT_IDS \ . =3D ALIGN(PAGE_SIZE); \ __hyp_rodata_end =3D .; \ } @@ -307,6 +318,13 @@ SECTIONS =20 HYPERVISOR_DATA_SECTION =20 +#ifdef CONFIG_NVHE_EL2_TRACING + .data.hyp_events : { + __hyp_events_start =3D .; + *(SORT(_hyp_events.*)) + __hyp_events_end =3D .; + } +#endif /* * Data written with the MMU off but read with the MMU on requires * cache lines to be invalidated, discarding up to a Cache Writeback diff --git a/arch/arm64/kvm/hyp/include/nvhe/define_events.h b/arch/arm64/k= vm/hyp/include/nvhe/define_events.h new file mode 100644 index 000000000000..776d4c6cb702 --- /dev/null +++ b/arch/arm64/kvm/hyp/include/nvhe/define_events.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#undef HYP_EVENT +#define HYP_EVENT(__name, __proto, __struct, __assign, __printk) \ + struct hyp_event_id hyp_event_id_##__name \ + __section(".hyp.event_ids."#__name) =3D { \ + .enabled =3D ATOMIC_INIT(0), \ + } + +#define HYP_EVENT_MULTI_READ +#include +#undef HYP_EVENT_MULTI_READ + +#undef HYP_EVENT diff --git a/arch/arm64/kvm/hyp/include/nvhe/trace.h b/arch/arm64/kvm/hyp/i= nclude/nvhe/trace.h index 44912869d184..802a18b77c56 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/trace.h +++ b/arch/arm64/kvm/hyp/include/nvhe/trace.h @@ -1,9 +1,36 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #ifndef __ARM64_KVM_HYP_NVHE_TRACE_H #define __ARM64_KVM_HYP_NVHE_TRACE_H + +#include + #include =20 +#define HE_PROTO(__args...) __args +#define HE_ASSIGN(__args...) __args +#define HE_STRUCT RE_STRUCT +#define he_field re_field + #ifdef CONFIG_NVHE_EL2_TRACING + +#define HYP_EVENT(__name, __proto, __struct, __assign, __printk) \ + REMOTE_EVENT_FORMAT(__name, __struct); \ + extern struct hyp_event_id hyp_event_id_##__name; \ + static __always_inline void trace_##__name(__proto) \ + { \ + struct remote_event_format_##__name *__entry; \ + size_t length =3D sizeof(*__entry); \ + \ + if (!atomic_read(&hyp_event_id_##__name.enabled)) \ + return; \ + __entry =3D tracing_reserve_entry(length); \ + if (!__entry) \ + return; \ + __entry->hdr.id =3D hyp_event_id_##__name.id; \ + __assign \ + tracing_commit_entry(); \ + } + void *tracing_reserve_entry(unsigned long length); void tracing_commit_entry(void); =20 @@ -13,9 +40,12 @@ int __tracing_enable(bool enable); int __tracing_swap_reader(unsigned int cpu); void __tracing_update_clock(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_c= yc); int __tracing_reset(unsigned int cpu); +int __tracing_enable_event(unsigned short id, bool enable); #else static inline void *tracing_reserve_entry(unsigned long length) { return N= ULL; } static inline void tracing_commit_entry(void) { } +#define HYP_EVENT(__name, __proto, __struct, __assign, __printk) \ + static inline void trace_##__name(__proto) {} =20 static inline int __tracing_load(unsigned long desc_va, size_t desc_size) = { return -ENODEV; } static inline void __tracing_unload(void) { } @@ -23,5 +53,6 @@ static inline int __tracing_enable(bool enable) { return = -ENODEV; } static inline int __tracing_swap_reader(unsigned int cpu) { return -ENODEV= ; } static inline void __tracing_update_clock(u32 mult, u32 shift, u64 epoch_n= s, u64 epoch_cyc) { } static inline int __tracing_reset(unsigned int cpu) { return -ENODEV; } +static inline int __tracing_enable_event(unsigned short id, bool enable) = { return -ENODEV; } #endif #endif diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Mak= efile index f1840628d2d6..143d55ec7298 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -29,7 +29,7 @@ hyp-obj-y +=3D ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cp= uif-proxy.o ../entry.o \ ../fpsimd.o ../hyp-entry.o ../exception.o ../pgtable.o hyp-obj-y +=3D ../../../kernel/smccc-call.o hyp-obj-$(CONFIG_LIST_HARDENED) +=3D list_debug.o -hyp-obj-$(CONFIG_NVHE_EL2_TRACING) +=3D clock.o trace.o +hyp-obj-$(CONFIG_NVHE_EL2_TRACING) +=3D clock.o trace.o events.o hyp-obj-y +=3D $(lib-objs) =20 # Path to simple_ring_buffer.c diff --git a/arch/arm64/kvm/hyp/nvhe/events.c b/arch/arm64/kvm/hyp/nvhe/eve= nts.c new file mode 100644 index 000000000000..add9383aadb5 --- /dev/null +++ b/arch/arm64/kvm/hyp/nvhe/events.c @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2025 Google LLC + * Author: Vincent Donnefort + */ + +#include +#include + +#include + +int __tracing_enable_event(unsigned short id, bool enable) +{ + struct hyp_event_id *event_id =3D &__hyp_event_ids_start[id]; + atomic_t *enabled; + + if (event_id >=3D __hyp_event_ids_end) + return -EINVAL; + + enabled =3D hyp_fixmap_map(__hyp_pa(&event_id->enabled)); + atomic_set(enabled, enable); + hyp_fixmap_unmap(); + + return 0; +} diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/h= yp-main.c index 5acbd451efbd..7f5b9807c42d 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -632,6 +632,14 @@ static void handle___tracing_reset(struct kvm_cpu_cont= ext *host_ctxt) cpu_reg(host_ctxt, 1) =3D __tracing_reset(cpu); } =20 +static void handle___tracing_enable_event(struct kvm_cpu_context *host_ctx= t) +{ + DECLARE_REG(unsigned short, id, host_ctxt, 1); + DECLARE_REG(bool, enable, host_ctxt, 2); + + cpu_reg(host_ctxt, 1) =3D __tracing_enable_event(id, enable); +} + typedef void (*hcall_t)(struct kvm_cpu_context *); =20 #define HANDLE_FUNC(x) [__KVM_HOST_SMCCC_FUNC_##x] =3D (hcall_t)handle_##x @@ -679,6 +687,7 @@ static const hcall_t host_hcall[] =3D { HANDLE_FUNC(__tracing_swap_reader), HANDLE_FUNC(__tracing_update_clock), HANDLE_FUNC(__tracing_reset), + HANDLE_FUNC(__tracing_enable_event), }; =20 static void handle_host_hcall(struct kvm_cpu_context *host_ctxt) diff --git a/arch/arm64/kvm/hyp/nvhe/hyp.lds.S b/arch/arm64/kvm/hyp/nvhe/hy= p.lds.S index d724f6d69302..7a02837203d1 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp.lds.S +++ b/arch/arm64/kvm/hyp/nvhe/hyp.lds.S @@ -16,6 +16,12 @@ SECTIONS { HYP_SECTION(.text) HYP_SECTION(.data..ro_after_init) HYP_SECTION(.rodata) +#ifdef CONFIG_NVHE_EL2_TRACING + . =3D ALIGN(PAGE_SIZE); + BEGIN_HYP_SECTION(.event_ids) + *(SORT(.hyp.event_ids.*)) + END_HYP_SECTION +#endif =20 /* * .hyp..data..percpu needs to be page aligned to maintain the same diff --git a/arch/arm64/kvm/hyp_trace.c b/arch/arm64/kvm/hyp_trace.c index 09bc192e3514..0144cd26703e 100644 --- a/arch/arm64/kvm/hyp_trace.c +++ b/arch/arm64/kvm/hyp_trace.c @@ -318,6 +318,25 @@ static int hyp_trace_reset(unsigned int cpu, void *pri= v) =20 static int hyp_trace_enable_event(unsigned short id, bool enable, void *pr= iv) { + struct hyp_event_id *event_id =3D lm_alias(&__hyp_event_ids_start[id]); + struct page *page; + atomic_t *enabled; + void *map; + + if (is_protected_kvm_enabled()) + return kvm_call_hyp_nvhe(__tracing_enable_event, id, enable); + + enabled =3D &event_id->enabled; + page =3D virt_to_page(enabled); + map =3D vmap(&page, 1, VM_MAP, PAGE_KERNEL); + if (!map) + return -ENOMEM; + + enabled =3D map + offset_in_page(enabled); + atomic_set(enabled, enable); + + vunmap(map); + return 0; } =20 @@ -345,6 +364,19 @@ static struct trace_remote_callbacks trace_remote_call= backs =3D { .enable_event =3D hyp_trace_enable_event, }; =20 +#include + +static void __init hyp_trace_init_events(void) +{ + struct hyp_event_id *hyp_event_id =3D __hyp_event_ids_start; + struct remote_event *event =3D __hyp_events_start; + int id =3D 0; + + /* Events on both sides hypervisor are sorted */ + for (; event < __hyp_events_end; event++, hyp_event_id++, id++) + event->id =3D hyp_event_id->id =3D id; +} + int __init kvm_hyp_trace_init(void) { int cpu; @@ -364,5 +396,8 @@ int __init kvm_hyp_trace_init(void) } #endif =20 - return trace_remote_register("hypervisor", &trace_remote_callbacks, &trac= e_buffer, NULL, 0); + hyp_trace_init_events(); + + return trace_remote_register("hypervisor", &trace_remote_callbacks, &trac= e_buffer, + __hyp_events_start, __hyp_events_end - __hyp_events_start); } --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 2026 Received: from mail-ej1-f74.google.com (mail-ej1-f74.google.com [209.85.218.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 32C45358D08 for ; Sat, 31 Jan 2026 13:29:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866193; cv=none; b=WPhE/BnnFOKHNb3qrPC/+UoNLijJgq/plYzJeSRhvDrWmb0SYZCugrpun9zTLPGT7GjRydD90dLwU71SanB+aNZ6KD+4SJdZhkTwc46Du+AqFEqZR6fZHOt4HX6ptp64IXWkm8xhvB/OWTsueGad/dYmvH1Jhkn6ol/BFFVNH0U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866193; c=relaxed/simple; bh=kgemvSddXhox6/yEO+Fh/xwaYTyNPQaHaiJ5BFcRrRQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=oN/IlO5IW97m6SJ4URf1B783GqO8m9YUtFUWygsUQGF0SECCHgpwih24UJi+789EyDXq0FH7QRXlCZk8eAjuPrlCq5Z/m/ClutwDruoiV44VALhEpRwKwso+xmQD+HiTw0rE3+Y6T6aT5/1qmzYGcql5lA9/1sD6VZoTNs8XNHU= 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=Q6l8+ARe; arc=none smtp.client-ip=209.85.218.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="Q6l8+ARe" Received: by mail-ej1-f74.google.com with SMTP id a640c23a62f3a-b8718916c9aso315097866b.0 for ; Sat, 31 Jan 2026 05:29:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866188; x=1770470988; 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=kwAokIjvjP4GaY69UfG//QG/8WpwXMR+YpVP6jfcixQ=; b=Q6l8+ARe5msy8GJyPd6/2bRNKlf+qXcuSp8dSRS4ZmADTfMjBqsWuDRyHH9RL1ScPz M94Dd0dJOoaHRT8z4jy9M8E9PckrJzi+u/LZSvWphrnEvqgp/0jeT8JSVq8xdOYPCtxJ g7NaRZtH5/EvCjTSOQfmZiojYWZSn2piYk74hOeXDC995mQf4J6Nqyn9fQadKMw7wGVo xz1G/MOlff7XTk+HZdclWfxQe4x32y+kksR7vvKYqFuc5aC812te1/gZA3/BE3UBeHIO cocQtdLgfsfC5CTJU5kz5/bGWyqDXKVPgK5RAFPLHPIVbM+yTsfjLM7U1iPzZSZRB2de 2tBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866188; x=1770470988; 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=kwAokIjvjP4GaY69UfG//QG/8WpwXMR+YpVP6jfcixQ=; b=wdx1RY8zVgmGp5eyn5NO2I9cUR27dX/eVCMQBbl+N8rOrx+rMr8+KYkOrwY64NKEb0 gJXFDP9Ie4v5PaVkjFzMX+bFqnCLERTx//4LeJUx0K+l5AiGAZzjSjTW+GdZnJf2xoPG wiWGYSR0vT3GA6ICG3JsgCzTQ8ZTNTbx3EjmPckcFlVimye0PackLwvgKyonY1GGDraV XFlMZ7GaEarCZNZ7O5feYiUtTcoXB/EeswaAuHz5Yowaoj0aaZRMBVNaDcokhHbs4ETI 64oHyTg4A8Jpsj7OXkJL4mc9dR82fPBPnRpv4INcXXNJc38FCiW0nBETHrFS6HNT6jGJ idrg== X-Forwarded-Encrypted: i=1; AJvYcCWJO2/VXrOpiZiXQI1rwEhd/3Nwo5K1TYgASUxo/ut7uD96va8XfbVQEQ+hZDE+lON8YfqIRAexURvXals=@vger.kernel.org X-Gm-Message-State: AOJu0YxI0zwEQXZo5TICR9FdBtdFDyjKvg3zjVLELppdgl052IE9r+++ JJIbJw5p8SIl7Zn0e7exH8RWX3V7nROR3CLnT24udRquGyUpjzzxK6PdxUPP/0XVh9BKs3/ye8C ZVnPiwYU3it9CO8szwBC5Mw== X-Received: from ejboy27.prod.google.com ([2002:a17:907:105b:b0:b88:4858:17c6]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a17:906:eecb:b0:b88:31f9:1d9a with SMTP id a640c23a62f3a-b8dff71fbbcmr400020566b.62.1769866188334; Sat, 31 Jan 2026 05:29:48 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:46 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-29-vdonnefort@google.com> Subject: [PATCH v11 28/30] KVM: arm64: Add hyp_enter/hyp_exit events to nVHE/pKVM hyp From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The hyp_enter and hyp_exit events are logged by the hypervisor any time it is entered and exited. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm= _host.h index ac7f970c7883..58f7fe685150 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -896,6 +896,9 @@ struct kvm_vcpu_arch { =20 /* Per-vcpu TLB for VNCR_EL2 -- NULL when !NV */ struct vncr_tlb *vncr_tlb; + + /* Hyp-readable copy of kvm_vcpu::pid */ + pid_t pid; }; =20 /* diff --git a/arch/arm64/include/asm/kvm_hypevents.h b/arch/arm64/include/as= m/kvm_hypevents.h index d6e033c96c52..221a1dacb2f0 100644 --- a/arch/arm64/include/asm/kvm_hypevents.h +++ b/arch/arm64/include/asm/kvm_hypevents.h @@ -7,4 +7,43 @@ #include #endif =20 +#ifndef __HYP_ENTER_EXIT_REASON +#define __HYP_ENTER_EXIT_REASON +enum hyp_enter_exit_reason { + HYP_REASON_SMC, + HYP_REASON_HVC, + HYP_REASON_PSCI, + HYP_REASON_HOST_ABORT, + HYP_REASON_GUEST_EXIT, + HYP_REASON_ERET_HOST, + HYP_REASON_ERET_GUEST, + HYP_REASON_UNKNOWN /* Must be last */ +}; +#endif + +HYP_EVENT(hyp_enter, + HE_PROTO(struct kvm_cpu_context *host_ctxt, u8 reason), + HE_STRUCT( + he_field(u8, reason) + he_field(pid_t, vcpu) + ), + HE_ASSIGN( + __entry->reason =3D reason; + __entry->vcpu =3D __tracing_get_vcpu_pid(host_ctxt); + ), + HE_PRINTK("reason=3D%s vcpu=3D%d", __hyp_enter_exit_reason_str(__entry->r= eason), __entry->vcpu) +); + +HYP_EVENT(hyp_exit, + HE_PROTO(struct kvm_cpu_context *host_ctxt, u8 reason), + HE_STRUCT( + he_field(u8, reason) + he_field(pid_t, vcpu) + ), + HE_ASSIGN( + __entry->reason =3D reason; + __entry->vcpu =3D __tracing_get_vcpu_pid(host_ctxt); + ), + HE_PRINTK("reason=3D%s vcpu=3D%d", __hyp_enter_exit_reason_str(__entry->r= eason), __entry->vcpu) +); #endif diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index f7f222ecaf88..5b7c728c69ca 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -662,6 +662,8 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) =20 if (!cpumask_test_cpu(cpu, vcpu->kvm->arch.supported_cpus)) vcpu_set_on_unsupported_cpu(vcpu); + + vcpu->arch.pid =3D pid_nr(vcpu->pid); } =20 void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) diff --git a/arch/arm64/kvm/hyp/include/nvhe/arm-smccc.h b/arch/arm64/kvm/h= yp/include/nvhe/arm-smccc.h new file mode 100644 index 000000000000..1258bc84477f --- /dev/null +++ b/arch/arm64/kvm/hyp/include/nvhe/arm-smccc.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ARM64_KVM_HYP_NVHE_ARM_SMCCC_H__ +#define __ARM64_KVM_HYP_NVHE_ARM_SMCCC_H__ + +#include + +#include + +#define hyp_smccc_1_1_smc(...) \ + do { \ + trace_hyp_exit(NULL, HYP_REASON_SMC); \ + arm_smccc_1_1_smc(__VA_ARGS__); \ + trace_hyp_enter(NULL, HYP_REASON_SMC); \ + } while (0) + +#define hyp_smccc_1_2_smc(...) \ + do { \ + trace_hyp_exit(NULL, HYP_REASON_SMC); \ + arm_smccc_1_2_smc(__VA_ARGS__); \ + trace_hyp_enter(NULL, HYP_REASON_SMC); \ + } while (0) + +#endif /* __ARM64_KVM_HYP_NVHE_ARM_SMCCC_H__ */ diff --git a/arch/arm64/kvm/hyp/include/nvhe/trace.h b/arch/arm64/kvm/hyp/i= nclude/nvhe/trace.h index 802a18b77c56..8813ff250f8e 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/trace.h +++ b/arch/arm64/kvm/hyp/include/nvhe/trace.h @@ -6,6 +6,18 @@ =20 #include =20 +static inline pid_t __tracing_get_vcpu_pid(struct kvm_cpu_context *host_ct= xt) +{ + struct kvm_vcpu *vcpu; + + if (!host_ctxt) + host_ctxt =3D host_data_ptr(host_ctxt); + + vcpu =3D host_ctxt->__hyp_running_vcpu; + + return vcpu ? vcpu->arch.pid : 0; +} + #define HE_PROTO(__args...) __args #define HE_ASSIGN(__args...) __args #define HE_STRUCT RE_STRUCT diff --git a/arch/arm64/kvm/hyp/nvhe/ffa.c b/arch/arm64/kvm/hyp/nvhe/ffa.c index f731cc4c3f28..ee5d49e733c0 100644 --- a/arch/arm64/kvm/hyp/nvhe/ffa.c +++ b/arch/arm64/kvm/hyp/nvhe/ffa.c @@ -26,10 +26,10 @@ * the duration and are therefore serialised. */ =20 -#include #include #include =20 +#include #include #include #include @@ -147,7 +147,7 @@ static int ffa_map_hyp_buffers(u64 ffa_page_count) { struct arm_smccc_1_2_regs res; =20 - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 =3D FFA_FN64_RXTX_MAP, .a1 =3D hyp_virt_to_phys(hyp_buffers.tx), .a2 =3D hyp_virt_to_phys(hyp_buffers.rx), @@ -161,7 +161,7 @@ static int ffa_unmap_hyp_buffers(void) { struct arm_smccc_1_2_regs res; =20 - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 =3D FFA_RXTX_UNMAP, .a1 =3D HOST_FFA_ID, }, &res); @@ -172,7 +172,7 @@ static int ffa_unmap_hyp_buffers(void) static void ffa_mem_frag_tx(struct arm_smccc_1_2_regs *res, u32 handle_lo, u32 handle_hi, u32 fraglen, u32 endpoint_id) { - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 =3D FFA_MEM_FRAG_TX, .a1 =3D handle_lo, .a2 =3D handle_hi, @@ -184,7 +184,7 @@ static void ffa_mem_frag_tx(struct arm_smccc_1_2_regs *= res, u32 handle_lo, static void ffa_mem_frag_rx(struct arm_smccc_1_2_regs *res, u32 handle_lo, u32 handle_hi, u32 fragoff) { - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 =3D FFA_MEM_FRAG_RX, .a1 =3D handle_lo, .a2 =3D handle_hi, @@ -196,7 +196,7 @@ static void ffa_mem_frag_rx(struct arm_smccc_1_2_regs *= res, u32 handle_lo, static void ffa_mem_xfer(struct arm_smccc_1_2_regs *res, u64 func_id, u32 = len, u32 fraglen) { - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 =3D func_id, .a1 =3D len, .a2 =3D fraglen, @@ -206,7 +206,7 @@ static void ffa_mem_xfer(struct arm_smccc_1_2_regs *res= , u64 func_id, u32 len, static void ffa_mem_reclaim(struct arm_smccc_1_2_regs *res, u32 handle_lo, u32 handle_hi, u32 flags) { - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 =3D FFA_MEM_RECLAIM, .a1 =3D handle_lo, .a2 =3D handle_hi, @@ -216,7 +216,7 @@ static void ffa_mem_reclaim(struct arm_smccc_1_2_regs *= res, u32 handle_lo, =20 static void ffa_retrieve_req(struct arm_smccc_1_2_regs *res, u32 len) { - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 =3D FFA_FN64_MEM_RETRIEVE_REQ, .a1 =3D len, .a2 =3D len, @@ -225,7 +225,7 @@ static void ffa_retrieve_req(struct arm_smccc_1_2_regs = *res, u32 len) =20 static void ffa_rx_release(struct arm_smccc_1_2_regs *res) { - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 =3D FFA_RX_RELEASE, }, res); } @@ -728,7 +728,7 @@ static int hyp_ffa_post_init(void) size_t min_rxtx_sz; struct arm_smccc_1_2_regs res; =20 - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs){ + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs){ .a0 =3D FFA_ID_GET, }, &res); if (res.a0 !=3D FFA_SUCCESS) @@ -737,7 +737,7 @@ static int hyp_ffa_post_init(void) if (res.a2 !=3D HOST_FFA_ID) return -EINVAL; =20 - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs){ + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs){ .a0 =3D FFA_FEATURES, .a1 =3D FFA_FN64_RXTX_MAP, }, &res); @@ -788,7 +788,7 @@ static void do_ffa_version(struct arm_smccc_1_2_regs *r= es, * first if TEE supports it. */ if (FFA_MINOR_VERSION(ffa_req_version) < FFA_MINOR_VERSION(hyp_ffa_versio= n)) { - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 =3D FFA_VERSION, .a1 =3D ffa_req_version, }, res); @@ -824,7 +824,7 @@ static void do_ffa_part_get(struct arm_smccc_1_2_regs *= res, goto out_unlock; } =20 - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 =3D FFA_PARTITION_INFO_GET, .a1 =3D uuid0, .a2 =3D uuid1, @@ -939,7 +939,7 @@ int hyp_ffa_init(void *pages) if (kvm_host_psci_config.smccc_version < ARM_SMCCC_VERSION_1_2) return 0; =20 - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 =3D FFA_VERSION, .a1 =3D FFA_VERSION_1_2, }, &res); diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/h= yp-main.c index 7f5b9807c42d..e1d4a53260ff 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -12,6 +12,7 @@ #include #include #include +#include #include =20 #include @@ -137,6 +138,8 @@ static void flush_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vc= pu) hyp_vcpu->vcpu.arch.vsesr_el2 =3D host_vcpu->arch.vsesr_el2; =20 hyp_vcpu->vcpu.arch.vgic_cpu.vgic_v3 =3D host_vcpu->arch.vgic_cpu.vgic_v3; + + hyp_vcpu->vcpu.arch.pid =3D host_vcpu->arch.pid; } =20 static void sync_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu) @@ -728,7 +731,9 @@ static void handle_host_hcall(struct kvm_cpu_context *h= ost_ctxt) =20 static void default_host_smc_handler(struct kvm_cpu_context *host_ctxt) { + trace_hyp_exit(host_ctxt, HYP_REASON_SMC); __kvm_hyp_host_forward_smc(host_ctxt); + trace_hyp_enter(host_ctxt, HYP_REASON_SMC); } =20 static void handle_host_smc(struct kvm_cpu_context *host_ctxt) @@ -752,18 +757,24 @@ void handle_trap(struct kvm_cpu_context *host_ctxt) { u64 esr =3D read_sysreg_el2(SYS_ESR); =20 + switch (ESR_ELx_EC(esr)) { case ESR_ELx_EC_HVC64: + trace_hyp_enter(host_ctxt, HYP_REASON_HVC); handle_host_hcall(host_ctxt); break; case ESR_ELx_EC_SMC64: + trace_hyp_enter(host_ctxt, HYP_REASON_SMC); handle_host_smc(host_ctxt); break; case ESR_ELx_EC_IABT_LOW: case ESR_ELx_EC_DABT_LOW: + trace_hyp_enter(host_ctxt, HYP_REASON_HOST_ABORT); handle_host_mem_abort(host_ctxt); break; default: BUG(); } + + trace_hyp_exit(host_ctxt, HYP_REASON_ERET_HOST); } diff --git a/arch/arm64/kvm/hyp/nvhe/psci-relay.c b/arch/arm64/kvm/hyp/nvhe= /psci-relay.c index c3e196fb8b18..ab4c7bddb163 100644 --- a/arch/arm64/kvm/hyp/nvhe/psci-relay.c +++ b/arch/arm64/kvm/hyp/nvhe/psci-relay.c @@ -6,11 +6,12 @@ =20 #include #include +#include #include -#include #include #include =20 +#include #include #include =20 @@ -65,7 +66,7 @@ static unsigned long psci_call(unsigned long fn, unsigned= long arg0, { struct arm_smccc_res res; =20 - arm_smccc_1_1_smc(fn, arg0, arg1, arg2, &res); + hyp_smccc_1_1_smc(fn, arg0, arg1, arg2, &res); return res.a0; } =20 @@ -206,6 +207,7 @@ asmlinkage void __noreturn __kvm_host_psci_cpu_entry(bo= ol is_cpu_on) struct kvm_cpu_context *host_ctxt; =20 host_ctxt =3D host_data_ptr(host_ctxt); + trace_hyp_enter(host_ctxt, HYP_REASON_PSCI); =20 if (is_cpu_on) boot_args =3D this_cpu_ptr(&cpu_on_args); @@ -221,6 +223,7 @@ asmlinkage void __noreturn __kvm_host_psci_cpu_entry(bo= ol is_cpu_on) write_sysreg_el1(INIT_SCTLR_EL1_MMU_OFF, SYS_SCTLR); write_sysreg(INIT_PSTATE_EL1, SPSR_EL2); =20 + trace_hyp_exit(host_ctxt, HYP_REASON_PSCI); __host_enter(host_ctxt); } =20 diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/swi= tch.c index 779089e42681..ca60721501d1 100644 --- a/arch/arm64/kvm/hyp/nvhe/switch.c +++ b/arch/arm64/kvm/hyp/nvhe/switch.c @@ -7,7 +7,6 @@ #include #include =20 -#include #include #include #include @@ -21,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -308,10 +308,13 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu) __debug_switch_to_guest(vcpu); =20 do { + trace_hyp_exit(host_ctxt, HYP_REASON_ERET_GUEST); + /* Jump in the fire! */ exit_code =3D __guest_enter(vcpu); =20 /* And we're baaack! */ + trace_hyp_enter(host_ctxt, HYP_REASON_GUEST_EXIT); } while (fixup_guest_exit(vcpu, &exit_code)); =20 __sysreg_save_state_nvhe(guest_ctxt); diff --git a/arch/arm64/kvm/hyp_trace.c b/arch/arm64/kvm/hyp_trace.c index 0144cd26703e..1ad6a55ba95c 100644 --- a/arch/arm64/kvm/hyp_trace.c +++ b/arch/arm64/kvm/hyp_trace.c @@ -364,8 +364,26 @@ static struct trace_remote_callbacks trace_remote_call= backs =3D { .enable_event =3D hyp_trace_enable_event, }; =20 +static const char *__hyp_enter_exit_reason_str(u8 reason); + #include =20 +static const char *__hyp_enter_exit_reason_str(u8 reason) +{ + static const char strs[][12] =3D { + "smc", + "hvc", + "psci", + "host_abort", + "guest_exit", + "eret_host", + "eret_guest", + "unknown", + }; + + return strs[min(reason, HYP_REASON_UNKNOWN)]; +} + static void __init hyp_trace_init_events(void) { struct hyp_event_id *hyp_event_id =3D __hyp_event_ids_start; --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 2026 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.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 497B535D60D for ; Sat, 31 Jan 2026 13:29:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866194; cv=none; b=EbhfXy+VQwsaHrwFLRFdXpKU7zKT8oCWQYtE6tbu/nEXfYAJ1x/NlWkoQBX8Z6MLJ3faVhf3T3gWucXpBehFY+U4PRLf1hYQGiicp2+0WwH+aj8+EjDV0GYCHSfUsECxKXO0sL9Xw9j8IMPgXVoQzF1jKOmmMdtT1tx7HsJP40Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866194; c=relaxed/simple; bh=BNB4B1BAs8BlVHq4fy+EUAdRjl2Wa/TOMGYs5X5AlFQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=QIATbt6vu1UIGfi9T9GN57nTM4Nv+7sRY3PXja+00UdOagzjWTimxMOKS+ONG+Zq7l+wGqH6hLVPHUOG5BNC+0/Fc3xrouGeLcHJwIgXLCl+yextEbOr1XpqeGxHfiregxVu8k8SMDXTzEIlJuh7llBD4CNU/W5VqsnOopgR6zg= 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=ehPFKbjn; arc=none smtp.client-ip=209.85.221.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="ehPFKbjn" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-430fcb6b2ebso2372579f8f.2 for ; Sat, 31 Jan 2026 05:29:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866189; x=1770470989; 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=JeFGHpGUZmExC+IpkIdtjA9N9gKTbIl9waldaXKaMEk=; b=ehPFKbjnMgvrM6GbTiF35Y4sii1jFDMB3qgyhmPo6hDEA9nF+DgvMXS/jLR0tY2Gf1 D8B6XJ5Xm7SCL53CiSvGqb/pSe+T3uDJLVXR4r9NXsFyE4QOhvDumf8mrIZ4hqzgtK9B M/NmzVklYRd3bX7qPeauPFWvvrY2icI/xFAvnvYIuxZJo6my3p2Rlqy1sy1e+c6gjdiD lqjZvAGGPYd9s7hMRNVmYHoEfCzpkdDVeI9yqJD+pB663WZTDwpKS/xCOqL2gVBkPBFf dDT+HdcO9ZPBLUVdvkFN9IYD0ApJezxwAZR2P6Jz1PZZU/l5RFb6Ju48Q9DNdpskXd4h H+Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866189; x=1770470989; 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=JeFGHpGUZmExC+IpkIdtjA9N9gKTbIl9waldaXKaMEk=; b=RfELANPcVgQEfR21uArziWeMc4O1OQCwCFXbcTG9yWiNizdCeMApJ/5Ato5/TWAPd6 mdrA57Ac9tJcPm074deK3UpDJQLGK97W2t3+yYdrKIW12cKRoyRkBvmjd/LILhga4CSo fxXp5NovjZHQhhA3fRmgDiN3UwM/BXq6ZwqfmGH4+FQuQpBldEFz3vyx2RMJPploMRiV knSDg+A65jeldD82jq6vLKRS2QAlJwi6t8QHXmtFTz84TBfTr0wrMdbS48wGPJqXlCbj +OnqUwaMrNqJWDPbqp0JqkdjqvPuTwo1G6D5mG2W/9p4x8tFZVCNtIMFimUvIBQaEbf1 ka5A== X-Forwarded-Encrypted: i=1; AJvYcCU60XnZohJrIZbTex7C/BORyvHKUfKpOnq6gYKglyiFZ15K8LiakmBiYtI6+phv1h3dDd2uh5yOVnwR47c=@vger.kernel.org X-Gm-Message-State: AOJu0Yxn3nibl66j7ktbg4mOZUNy07YpNaDT+fzGFkjiN/TkhNf0clLn Hqa+NZjPMN+GjSuRp7E2YopMNrN2WT0AzdXSlBhvlY78gXcWLCRyJbR1O5j5st4z5Y2Uhi7Fao1 a+6/WbjLTmxUnk97uMezgug== X-Received: from wrbfu10.prod.google.com ([2002:a05:6000:25ea:b0:435:c163:9abb]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:420d:b0:435:960c:5286 with SMTP id ffacd0b85a97d-435f3aba816mr8778061f8f.58.1769866189345; Sat, 31 Jan 2026 05:29:49 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:47 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-30-vdonnefort@google.com> Subject: [PATCH v11 29/30] KVM: arm64: Add selftest event support to nVHE/pKVM hyp From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a selftest event that can be triggered from a `write_event` tracefs file. This intends to be used by trace remote selftests. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_= asm.h index f8fa556ec3e1..c045c074614b 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -96,6 +96,7 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___tracing_update_clock, __KVM_HOST_SMCCC_FUNC___tracing_reset, __KVM_HOST_SMCCC_FUNC___tracing_enable_event, + __KVM_HOST_SMCCC_FUNC___tracing_write_event, }; =20 #define DECLARE_KVM_VHE_SYM(sym) extern char sym[] diff --git a/arch/arm64/include/asm/kvm_hypevents.h b/arch/arm64/include/as= m/kvm_hypevents.h index 221a1dacb2f0..743c49bd878f 100644 --- a/arch/arm64/include/asm/kvm_hypevents.h +++ b/arch/arm64/include/asm/kvm_hypevents.h @@ -46,4 +46,15 @@ HYP_EVENT(hyp_exit, ), HE_PRINTK("reason=3D%s vcpu=3D%d", __hyp_enter_exit_reason_str(__entry->r= eason), __entry->vcpu) ); + +HYP_EVENT(selftest, + HE_PROTO(u64 id), + HE_STRUCT( + he_field(u64, id) + ), + HE_ASSIGN( + __entry->id =3D id; + ), + RE_PRINTK("id=3D%llu", __entry->id) +); #endif diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/h= yp-main.c index e1d4a53260ff..5655c1690f4a 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -643,6 +643,13 @@ static void handle___tracing_enable_event(struct kvm_c= pu_context *host_ctxt) cpu_reg(host_ctxt, 1) =3D __tracing_enable_event(id, enable); } =20 +static void handle___tracing_write_event(struct kvm_cpu_context *host_ctxt) +{ + DECLARE_REG(u64, id, host_ctxt, 1); + + trace_selftest(id); +} + typedef void (*hcall_t)(struct kvm_cpu_context *); =20 #define HANDLE_FUNC(x) [__KVM_HOST_SMCCC_FUNC_##x] =3D (hcall_t)handle_##x @@ -691,6 +698,7 @@ static const hcall_t host_hcall[] =3D { HANDLE_FUNC(__tracing_update_clock), HANDLE_FUNC(__tracing_reset), HANDLE_FUNC(__tracing_enable_event), + HANDLE_FUNC(__tracing_write_event), }; =20 static void handle_host_hcall(struct kvm_cpu_context *host_ctxt) diff --git a/arch/arm64/kvm/hyp_trace.c b/arch/arm64/kvm/hyp_trace.c index 1ad6a55ba95c..c1e28f6581ab 100644 --- a/arch/arm64/kvm/hyp_trace.c +++ b/arch/arm64/kvm/hyp_trace.c @@ -348,8 +348,30 @@ static int hyp_trace_clock_show(struct seq_file *m, vo= id *v) } DEFINE_SHOW_ATTRIBUTE(hyp_trace_clock); =20 +static ssize_t hyp_trace_write_event_write(struct file *f, const char __us= er *ubuf, + size_t cnt, loff_t *pos) +{ + unsigned long val; + int ret; + + ret =3D kstrtoul_from_user(ubuf, cnt, 10, &val); + if (ret) + return ret; + + kvm_call_hyp_nvhe(__tracing_write_event, val); + + return cnt; +} + +static const struct file_operations hyp_trace_write_event_fops =3D { + .write =3D hyp_trace_write_event_write, +}; + static int hyp_trace_init_tracefs(struct dentry *d, void *priv) { + if (!tracefs_create_file("write_event", 0200, d, NULL, &hyp_trace_write_e= vent_fops)) + return -ENOMEM; + return tracefs_create_file("trace_clock", 0440, d, NULL, &hyp_trace_clock= _fops) ? 0 : -ENOMEM; } --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sun Feb 8 05:30:17 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 5EDE5360739 for ; Sat, 31 Jan 2026 13:29:52 +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=1769866195; cv=none; b=uaNE9vNOBsLkS0GzDa8udp+0Bzwu38c0r+cGjKpXIw9DM+6qAN41zaCq5tdj261x12KtpSupAzmAYvGrvHmyZoqgHONM0eBIx3hYiwh9Y0c1lU9dg7TU2RIPCAeczyuTxlkgzlKAwdbFUSx1H+1SVXmsjb/Kjb+pC3ISzGl6+js= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769866195; c=relaxed/simple; bh=D32IWT1yvJNiCztIHYR2AGCCVHmxZFcptNwe3+a563g=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=dff1RZgMOB2Bz0UBpZeS5839ewEJPTnHsA00y85GEWsdY+aJZubJCijeGBngqQ2dfXR7KdeVw2bfqYw2ifMnH8G0dfpPrgid+4fZXmQ7P8kXY5o/DxxmJB0ETjVgiytHiCyDb0TTc/G/L5xJ/shb9/67Jibwo0lapU+bsDubwIw= 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=mt3x14up; 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="mt3x14up" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4806fce5ab1so17894325e9.2 for ; Sat, 31 Jan 2026 05:29:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769866190; x=1770470990; 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=x0jKC8f/iEFEqNg/0cUe99XmInCeV76uXOT4uvAYEUM=; b=mt3x14upAydMErSxtmOcNJocB6FpFXXLeHupv/zFRpx+WwQxBJsduvRFjax9kTKTo2 GEsFFbIA9wfxEce+NaYjCzKzJTrrPKKqNLW4o4SfBaLObdPugagRehYOUI2vjXHOLfZ1 EzwiOoUKnXCLvJ7RCeiXKhD5nEfnFZDYin11nwpDFazYmqU1PfzY5IWg6wc2VgY6/OH1 UaOF9F8/pwg3tz8brzbr0EvXBtsClwi7a/QEezjpH+53EoRBausOUL6AZhbxhLvPqyuH ltZerpxmkupMrxMg09BqCQgfwr+4TlysRO+9mn6wHn6C/af7wfmS0dkG8lo+cD7bFO9w 0uNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769866190; x=1770470990; 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=x0jKC8f/iEFEqNg/0cUe99XmInCeV76uXOT4uvAYEUM=; b=CnHTMMWKETwDhh+Qw1dKwS66abLSBldDZ2UYILIGu+duBUHfPWaK6WTePmQnmMM5iA KZOg1QAhhHrEQhWAptDS1J6fW2n19cG8QfrT2Sb3w0fXjYsIGOcCpMde1U5W9bLnoO1R c4H4kt55w2B/ofIyzkEVvg24KgxYEHDUzNd1B6D0Ot6tarZpK0v2cJv3SzGiBJn5OLjx iPDCwYVGX/QZYjHlrR9k6k20qFsmlu/4YFXGuBRn3UkbusGp1ktQZwWtKZRC33YU3Wml 2FcGY8VQCnVxipL9AgAYFHts1y9/Uh7oS+479lCCW2Ej+OtJZJ8PfPmKJ4XylSMEJtsI waQQ== X-Forwarded-Encrypted: i=1; AJvYcCVy20Q7ACIq7rVfCU83ZLzBleIiAtsB5NTe93D5kRtOCqzeMNxDPUFrlTQvi9LGtlhpo/8cLoqHDMVkO+w=@vger.kernel.org X-Gm-Message-State: AOJu0YzdbOUMx/lafq1IdVKAoEb8bAzMr2LHhmRp/hWuJyN2Rjk/tX2H ROgDalTrhZh+rwG4BCCM92kkvaTOcvEUK8qXaKQbW0YfXbQVe4T2YCvKX1jRFmqjcI23bSWm+pY ID8ltJTcDqXk0Rb7JEA3ryA== X-Received: from wmk26.prod.google.com ([2002:a05:600c:29a:b0:480:4a03:7b5e]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4443:b0:475:dd8d:2f52 with SMTP id 5b1f17b1804b1-482db4a317bmr74357055e9.32.1769866190616; Sat, 31 Jan 2026 05:29:50 -0800 (PST) Date: Sat, 31 Jan 2026 13:28:48 +0000 In-Reply-To: <20260131132848.254084-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: <20260131132848.254084-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: <20260131132848.254084-31-vdonnefort@google.com> Subject: [PATCH v11 30/30] tracing: selftests: Add hypervisor trace remote tests From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort , Shuah Khan , linux-kselftest@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Run the trace remote selftests with the trace remote 'hypervisor', This trace remote is most likely created when the arm64 KVM nVHE/pKVM hypervisor is in use. Cc: Shuah Khan Cc: linux-kselftest@vger.kernel.org Signed-off-by: Vincent Donnefort diff --git a/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/buffe= r_size.tc b/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/buffer= _size.tc new file mode 100644 index 000000000000..64bf859d6406 --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/buffer_size.= tc @@ -0,0 +1,11 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test hypervisor trace buffer size +# requires: remotes/hypervisor/write_event + +SOURCE_REMOTE_TEST=3D1 +. $TEST_DIR/remotes/buffer_size.tc + +set -e +setup_remote "hypervisor" +test_buffer_size diff --git a/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/reset= .tc b/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/reset.tc new file mode 100644 index 000000000000..7fe3b09b34e3 --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/reset.tc @@ -0,0 +1,11 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test hypervisor trace buffer reset +# requires: remotes/hypervisor/write_event + +SOURCE_REMOTE_TEST=3D1 +. $TEST_DIR/remotes/reset.tc + +set -e +setup_remote "hypervisor" +test_reset diff --git a/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/trace= .tc b/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/trace.tc new file mode 100644 index 000000000000..b937c19ca7f9 --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/trace.tc @@ -0,0 +1,11 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test hypervisor non-consuming trace read +# requires: remotes/hypervisor/write_event + +SOURCE_REMOTE_TEST=3D1 +. $TEST_DIR/remotes/trace.tc + +set -e +setup_remote "hypervisor" +test_trace diff --git a/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/trace= _pipe.tc b/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/trace_p= ipe.tc new file mode 100644 index 000000000000..66aa1b76c147 --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/trace_pipe.tc @@ -0,0 +1,11 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test hypervisor consuming trace read +# requires: remotes/hypervisor/write_event + +SOURCE_REMOTE_TEST=3D1 +. $TEST_DIR/remotes/trace_pipe.tc + +set -e +setup_remote "hypervisor" +test_trace_pipe diff --git a/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/unloa= ding.tc b/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/unloadin= g.tc new file mode 100644 index 000000000000..1dafde3414ab --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/remotes/hypervisor/unloading.tc @@ -0,0 +1,11 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test hypervisor trace buffer unloading +# requires: remotes/hypervisor/write_event + +SOURCE_REMOTE_TEST=3D1 +. $TEST_DIR/remotes/unloading.tc + +set -e +setup_remote "hypervisor" +test_unloading --=20 2.53.0.rc1.225.gd81095ad13-goog