From nobody Sun Feb 8 10:03:20 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 337F930E847 for ; Mon, 26 Jan 2026 10:44:28 +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=1769424271; cv=none; b=mdI5VBzZcXnxHpwPcEWrnv6nPUE3HdtbOcAxI2HmaVLWNQMrXE/3KVwPh7SE9tcxctqrXlTS/gKZrZcmUVZpqpZLIzVFslzwS8VoPB03NjEL3PO+XuhoLttftwgG+m+u8hqFatSeptcZJ4Ms3QEll3EieQAtSh52Pd/Q4uEfZjE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424271; c=relaxed/simple; bh=t7R+pvWqC6CiC8mrPebUWkZQhBfP+oPIAOX+3pC+A90=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=F6lUd5GInsTs7LjwKC/7qkm8rwJ8dgNIa+j9Wv2z52o9ByjoxsK0AvWJvywGjtUUr2PhktJhxbxxTMyk039nAqn8xH90Vf51GNRYahxjTgfFwEJWfsn7x1aVfzgqJpTEH71lLBCPihyB6DSoBN8gec495l1ZZdVqZAWWdDYv8wA= 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=mJAThAIR; 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="mJAThAIR" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-480600391a0so7902955e9.0 for ; Mon, 26 Jan 2026 02:44:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424267; x=1770029067; 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=ffA5SL3LC5b8XzI2Nz3h29Xpe+4f+LbMdzYhyUIPyHo=; b=mJAThAIRB5vma8+LFrfjzgSldPBIyxhQQvfuHMiEMjfZ78RrMU+V/tDTqKoSjXWPkB qXKsAAIcgKYFr0rfjQ/cPNXe5uCTKlhkL9yJvUggxt1iLgUSJkfQ1zZFqAlNm2ruSOp8 lJTVGQtLjYtTq8Yd2UochfOnp0nXRmd29loZy5dNCzSg0Pl65LeKbUi1NtioQflu6YAi ySmyQbHSi6MaA9mvl9c2JWcKhZZ0mhq3gGEHhj3sNrN+2xmucR4tduK+pPYkCWA80iki f/7c7wW2l/RNH/WwwYDNNPrBvdLXviB/4+IbIEUKEpDObJr0AFOq3hFmQTLOZZJYZWAi 9TgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424267; x=1770029067; 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=ffA5SL3LC5b8XzI2Nz3h29Xpe+4f+LbMdzYhyUIPyHo=; b=dnuMx9FtAtgGrzI+fr9OyZr5MEPt8MdKVqM6dj+n51SgGUn6suVK4sYbLMuxIb2QAK 7JbFWsxH1TVf+0lcHDcocrQAUhR6hDJi00sev2qdOfKFiLPyNzreGivT9++3ZwtnXBN1 Wg4+ioR+U2Kk9lq5cPgdk78cLkQw4vojScgoOHsQhlMQ9dHBgmHMfTNijDUWB1BneZ49 1bwW7lCgtbuXOV4yoySYAsCAw5/25Yy7wm5KLM9+qXOcjvUzothyvZaYZzXyRSy0LLvE tonoJSAmTlnoWrInhoWpOn0AoaSEqGrcslbdXVtBgEyn3yE5LyaRc69eTjGEW178gQTy lDVQ== X-Forwarded-Encrypted: i=1; AJvYcCWVuuIeDpEd04WQir73HASSAcgf0AmmMANgasuyc97g/xEtbF68C12yJsw+FBVdyM8BN67O/uxcBo6IVRs=@vger.kernel.org X-Gm-Message-State: AOJu0YwYe6EE4z5/rKQ4RL0GhGUQeXkty/KCogA+OB7P3vOXBXoZRgAz +762SWDJ3l87exwsprhbiWIrZDqnXnzMQtr7zTpgnMZyGi8AP/V2QJiiRzdSD4jbqMi/BeQnjfp vhc76zwr0B+Yd/TcEUb5Jcw== X-Received: from wmbz12.prod.google.com ([2002:a05:600c:c08c:b0:480:4a03:7b6c]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:35c2:b0:47f:b737:5ce0 with SMTP id 5b1f17b1804b1-4805cf66771mr72717075e9.23.1769424266779; Mon, 26 Jan 2026 02:44:26 -0800 (PST) Date: Mon, 26 Jan 2026 10:43:50 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-2-vdonnefort@google.com> Subject: [PATCH v10 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. 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 Reviewed-by: Steven Rostedt (Google) --- 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 5A83232BF44 for ; Mon, 26 Jan 2026 10:44:29 +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=1769424271; cv=none; b=PFY9BxhQ2nYj9vjEus0i3p7RzumUdoil3gmyQiYiNnv17rnJ9PqGXJ9Dij64kk6kMWxUVXV4WMVi2y59UH2Diec49kMy+ukAenw7wkX/C5oA72hxPixo1S198rcP37Fj424QWmFIn54ry2nVoCuhLPRao65sG+cg3l4F+MtcZ5c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424271; c=relaxed/simple; bh=tphl6mAsqf9TdCql8VKZuCvMxwvX6h4t9eRuE9p+KfI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=a2a0n53SMtBY5gE4Wu/zEOqcxPc7zF31NDTQuCOmhdxU5PLqREN1Uw7V1paI30VtfW6COWCoqb/w9QtUH0xoVMlGsZjIrK0oV9WaYFyQIMAphG0/ryPs8/JskYFcDHWgGHD/1kuAJGdpVgurbxI0OWW4oB9Pq0+fFV+2Vb5MN9U= 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=zv/vxad0; 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="zv/vxad0" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-47ee1fe7b24so38243545e9.1 for ; Mon, 26 Jan 2026 02:44:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424268; x=1770029068; 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=WDghCh0fr0GDHLlC3mDjOKrkpIDo4KOlE5bpU6iht6g=; b=zv/vxad0aeWeW+GZrNF9uyIsY4fju3dg/xBj3jisN9cdC0HNQoRfoFuHBKSanPFONU QHHHoZmTFRfupzOnVsQyR4N2CdBSIU1h7I+wKfnXVdFewR3Y3JY3p++HpDt+2u5mZAiO scnsJPmuKYvwewr5Q4lo2z/MJnilLrHROGwF+BB9AtAaTxAsnOdUnPs3rNKVKu1ckHxC TckrjUK6tCSigw9oYbdnfu9H8TMl98gqrxk9vcjwh26E+TZRXvQ6TYB5SP1mGjWuBd6P 5uXWtbVsJ4v60N6aS7GgYhZLCBZBrkQKvJ3c8LhXW+EtEhXPsttZ3yD8SVai+VCaZSjs nWow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424268; x=1770029068; 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=WDghCh0fr0GDHLlC3mDjOKrkpIDo4KOlE5bpU6iht6g=; b=A5Pg/QQq2L04OUnC42Ro9Z/bCIfvXQwkMhRdZtNelN3hcH4AbewOGC0x9xE9tktwLF jZ1Y4BHG7fF+fXKLDMaosimkKfm6t4qleykc5dg0DvmTj3tlYu1G6NN6qqnOZjOlR43z jYQbc+6gOCbPjY8HuprszxqeH+p6BlszMQCpksloLtP88JlnRtMdmaMwI3sBh7hu7YAx DYoafcVOE1jcwTqZT4MbYC6z4ffHKj9NtNy98oZCmyWG/l6dytORxCXQvlqvTK095ORS jVhjjBFz3nwnhZPB3jV+T1b1Ia8OErGAHdR9Ncn/Ivf7b9+S4kGBl7Jzp7G/DvvdYmhQ fepQ== X-Forwarded-Encrypted: i=1; AJvYcCUQu7r/T0ywCcAwlSaZUMAH/nrlxKfI4KRZD/Wg3GZtXtrYl2ZBlm9izIWDN6yfvjVY0k67mxBp/tT4SW4=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5sovdtzNRn1MiZSekXf4Yqw6CBvqLocZ7r4+j+l4W611hs3Z/ nGNJ9nGtmv52CJaj0yvSN9pynjrq5GyBMQl1wMATIJCOso/71K3q5ZiOirOdPRKxjdxb41wUhwx lveDq/TjbjZy1bueZ0tBYUw== X-Received: from wmcq10.prod.google.com ([2002:a05:600c:c10a:b0:477:aa9e:db24]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:8905:b0:47d:5e02:14e5 with SMTP id 5b1f17b1804b1-4805d9664a3mr42612985e9.5.1769424267888; Mon, 26 Jan 2026 02:44:27 -0800 (PST) Date: Mon, 26 Jan 2026 10:43:51 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-3-vdonnefort@google.com> Subject: [PATCH v10 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. Signed-off-by: Vincent Donnefort diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 1187d632dd5d..a5d11487337e 100644 Reviewed-by: Steven Rostedt (Google) --- 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 4E53C330D35 for ; Mon, 26 Jan 2026 10:44:30 +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=1769424273; cv=none; b=uGrms2EgozNlElMfS8ZJBvQmmu6NXhx8Hgz2EhcVCIqXvjdiwyWMYJM1aMHGxGWS3DMj7gFPnBak1qPYHxPuFEyJkhgS+Tnw2uM5S1ijT7rsKg/byxdbZlyYcA1q4hvGvyu8n/Aq3HlcZeNqFX0hb64x57uFEI2EY04qfDQ/FSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424273; c=relaxed/simple; bh=d2jarEJhiUGUFMn7DugVModNPj58EZVieJcuax7iw70=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=HPmQgM0s1T2lKK+os4Df7/SKqgiJH1u4jfkWLrL2f8w27OV7VxibiWG4BdEVM+a1xPaUTzjqfQ5/1KnEbC60NAqP/hU5nsmB+3BDI1m8FQ3k6TAf5yjMOBCnaX+W2zwFZRSlH+tPzP+3zDQKEhRDD1wREfon0NSfuiSzmq7DYxo= 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=Lf6733NS; 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="Lf6733NS" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-47d62cc05daso42136335e9.3 for ; Mon, 26 Jan 2026 02:44:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424269; x=1770029069; 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=3IgxRSgRC1fLx1CpusWxdLuAuQ4rT/OUgikau4UenIY=; b=Lf6733NSQHR56zImy7Uk4GZo0r68yIK+Pcu5JBnK4frqEti210GuM7dKx2FEXEepOw YJbvGgCbv/uW4wKRntaDH384jm5NAdaJamSNcMnwwYVReIJPqjRRosMjq8Uy8w9YJU2i ynZLhui/rQD7d5b3xeTCw1wUJUgNRANqFA7TgBYNMfD1raOjGMvUloApyek1u2u3wtxo 8JXz4VI+wDu6e0f2P2sB5aVTRU2Uq1034KGy88bEYPLN92IU+pTvbn6VBzVJHXk1H7dN 6hQdQ41AbaVlLfQB1RmlTdhRa+9rfnd3hVE7cpcQpYH1n84dEgNzJNlKVQPJwNwHekfm 8g3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424269; x=1770029069; 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=3IgxRSgRC1fLx1CpusWxdLuAuQ4rT/OUgikau4UenIY=; b=kRp/jM7XK3lp6JvKeBzVJUa4bdOXg+RLJ7cqu+x+w/yPKC9YoPje+Dp920fnDCxuMl 8+YqKI61SDCW7Zner02b6KKBjO7KynpKhOLet+XkUFtj+lkLubtHSOSdXoyHJ/i3ZV/d y5FYVtJixDzbsLZuCiIwSvTlqF5lpohADr9B9nxe6mkuUe4hoQBjjhsm564xOIzI4tlU 8j9ZZFhRlLbhDJaFG2jqGgGkHatShHy72yLNENUBnl7stMpDKk1n5DO7g1HapsegZU1H dGjMuufRha5tYiHcvfM5873w4b8I5vvwSmPMY32ZKjqgYJXsJy0v19J/Zhhyc4EeKy62 CkTA== X-Forwarded-Encrypted: i=1; AJvYcCUxf/1F7hyl952j8ci+mqUCE++kToSQZd8Bpjv/5q7ZNjgp4mTNxwmP7htOPI4hqGYDv2bbztxUBAI6VvY=@vger.kernel.org X-Gm-Message-State: AOJu0YxrdmxGtIcFuk8Zc5JK80CdxbVGRV0rosCjSurcObSf52koPzVX KIfxUw34SGXdrdZHSgqw4sx7tJZ0K86xk5q1nZpeqmgYKjBSfyoOFPO08mTEehgX9Cx3pIMG9d1 x3weLI+meD9g9ysAQWi5gQA== X-Received: from wmk17.prod.google.com ([2002:a05:600c:291:b0:477:9dee:b5d5]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:6812:b0:477:a9e:859a with SMTP id 5b1f17b1804b1-4805cf668f1mr60514625e9.22.1769424268977; Mon, 26 Jan 2026 02:44:28 -0800 (PST) Date: Mon, 26 Jan 2026 10:43:52 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-4-vdonnefort@google.com> Subject: [PATCH v10 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. Signed-off-by: Vincent Donnefort diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index 876358cfe1b1..41193c5b0d28 100644 Reviewed-by: Steven Rostedt (Google) --- 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 0735F331A43 for ; Mon, 26 Jan 2026 10:44:31 +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=1769424273; cv=none; b=ImP7O0jNSIfkM5Ebueq1I1WVGGpjqxQjEyG6yNJxBOKqj5K5Lz5MsXnmfoEDXqluibXUbYfvgRyNPQEV/AYE3E1cYDLHBEhdGrIa1XJl9+Qm3pRE476OBBsPCbCsxQGgwn1PIF/pC/QUIARZSf/pSX06Nuac7pWq8EGqbWOhrOo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424273; c=relaxed/simple; bh=8F58iQMB4tBPv70sAm1v5E47V6FBgfk4KenF4H6rNnM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=uCjGHwRq68HvS6IQdD4zGEWA9ytOg1cttqrZbMyfNjtQVK+0GAMxO0HppvXPzxGcejUBL7zcbAUgI7G9qagcKlGCn4wI0UidLaiBsGLr9UnvEg0odvkKvEXvAi/RBJRRZNzF1CmmNEvvq4nmMaBLusd2XK+9K4M5cuoTWNcr2L8= 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=zaxtsiXr; 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="zaxtsiXr" Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-b841fc79f3eso341367866b.2 for ; Mon, 26 Jan 2026 02:44:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424270; x=1770029070; 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=7OmHJweSyCaZn58+xoi2Pzi5D+f/3kb8/kFIARNGu9Y=; b=zaxtsiXr0HRzTvSJvonXklV39wtpwzHMIN/trf9md3hm4wwADkPtfh6XebPM8ZQ+Xl RbtJw5KVElmPNcsgcWCX1UHM5M0F7tN/7yfwcnhD94C4FG94IvLm5vNfZDiPWw7h94Qe 5wudYDTV2DN+Uqiv97Quj07m0Uj+iHYPkeQBBOQd0+R8KDQ0906d4cgXkMIANQJ/cCln 2lDCEXjrNjAotmG3N/eR8xNFY4eQwhTUX94HN5Kl38T8Ei5WT3Kv/4SplDs3pH4PQTYA Llu+B7jjo0JdFS+syKUyZZctFAsLVF0J60sZeiW6YiUwG5F1feL35ZQ/zI0LfOMZV8rL yX5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424270; x=1770029070; 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=7OmHJweSyCaZn58+xoi2Pzi5D+f/3kb8/kFIARNGu9Y=; b=jG0zaMvaKfMPGWFVK4szKxsKFD2dN73n0u1qkx88TQ2JbXNcOdKh3aFkEkLLCSP9sA ST2fqpEx6EfbuYAxLrwfV2hmOWpsghNvQ21nfdcYEipXOZZehiVbb4ekQGN9GBdt+m1x CsbtgXQbnkKfMFwgfs7W1Vr0F1YRxxpPbLFRyFwC9KXq+rpPaxqunKzILVcB3/WI0W9R YKxrShtLga7f9rqs3TE0g25Kr+/VTamPf+izZuwTSGstyBd7p20LnYp7eWEgMnz/a7e3 76YZPdBTnBt+j1B490t0ujJZE2QnUsjtFbLYpg5z4Id+jEPEA9hGsN/F/+aI2LsnSxuU kZHQ== X-Forwarded-Encrypted: i=1; AJvYcCWa4rKnxho1ZEnWYYnGiMO4FBvrA55o8uAZgn8dxs/mN+qRU/j8xjDjUNgK8HIUwj7YvRYR7czSW8qaV+Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yxi5OM32gA6vlpd8pp9NpwDbmCLY4xqI4FPAnKbf+csEQ+CXKt2 sdH7mIHlPxM61YFBTlAh8aX03cByiQgBYmU4T1v7sBpnzDmevV9uOChuPACxJXdMn9rgGsdW3kR 0g7MPtAKxhcdo2YkJhI5+Xw== X-Received: from ejbgc18.prod.google.com ([2002:a17:906:c8d2:b0:b88:4972:40aa]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:c10:b0:b73:4d06:bc8 with SMTP id a640c23a62f3a-b8d4f796f90mr289787966b.53.1769424270027; Mon, 26 Jan 2026 02:44:30 -0800 (PST) Date: Mon, 26 Jan 2026 10:43:53 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-5-vdonnefort@google.com> Subject: [PATCH v10 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. Signed-off-by: Vincent Donnefort diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 00754339733d..2d08dd326309 100644 Reviewed-by: Steven Rostedt (Google) --- 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 D3FFA3321C1 for ; Mon, 26 Jan 2026 10:44:32 +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=1769424275; cv=none; b=ch4hmLxA5tNYzmAFMXWPme9X2euYeWRQ540K27ujLiVi3GBj+1L2te8k/tGm420dn0lwAv9W3KEi/WjH/7xbsFJVlZHQxzQzSnAYbZThR1nPb+WwFBfaon3y1/GzeJJL/qOhHuU16a3snHP2OP2iYTC7a3gdAzyFE5JSmtNyKgU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424275; c=relaxed/simple; bh=N/Fj+3sOcE639emG1EV6EvW5R0hL5dpHKGpD1KOuZgA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=tjJm2O9e4T1m86LE8ICzsPyaGuT0xmFqW+0qzXe+UoMVUEqAZnxLq/QoVillKlC4yFDJCI+AtNHnbXgsBJ9QRQTexrCy6I6CYEPjKFRIvG6UjutOLwFiazk0XESAtcEQbCAizv9uxXuB0HvealaBocMFxECI4TlFal2wFHtudqI= 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=Fc8e/gBI; 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="Fc8e/gBI" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-47ee8808ffbso32711585e9.2 for ; Mon, 26 Jan 2026 02:44:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424271; x=1770029071; 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=zGIwriqO0iNoSCzmwXWq28l72t89WV1meQxTJqr2/Mc=; b=Fc8e/gBI4x/WIYf2GVkHdx2duLl1kkNWVJwiVZphHx267TfqYG1dh+BVOZ3VX5z2PQ 1RwMFZX3Nw9616b5pYxwKb9wWVrY4Ebes5li78AS5eX9Kqq6dHj5qzsP29GoOc8u6IDj y+gXsVRkVst7TVenA9nuXgwPGcb7yrTUKHtai6ADObX2FWR3HNqZ4YJiVEEL8vXI/57V ZxJkRyzNVxVf0QewlXvjZbzQ03uB0N0r8LW1Oj7wKaUdBBtFPQR1PsG66lW+If1aSUPz qTpuFPSPOh5pgRQsk4U8+LSMJcQFOzwVerKOJ1TnKWcUFDj01rZIhD5n/rbzXCud9u5c daJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424271; x=1770029071; 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=zGIwriqO0iNoSCzmwXWq28l72t89WV1meQxTJqr2/Mc=; b=X7A0ae2FaFlh0oo3nsdzeA2nwD/i282wUVAYrK/RNOFUrBVSTfDZb2QH0cuaBLyBIA qzZ5Btf3rChsoJOsq/IcZQKq+6SI3HjXa69hIoK9+sgIsiJn8cvIgqyXL0JGdfrzczTm 5IJIQdZU5F8Dd96SRq+iSWO6iInmTNHAgwDLh+3mnvje0sg7U9HoCYJrIOf9xmbj9UFO 0wkL1gm/6fkWAReQZIhXielTAAS0tC3YlJ5s67SEnF631Sx5/vt7Qx8G223YXD1nf69B GHjg0BbL8UB9eAxv9gUTWmy456i4yXF37IjfXoReB/gNpC1+sfUH1WxdTftRaHKd35ki kaCg== X-Forwarded-Encrypted: i=1; AJvYcCVQE7ZRveoz0mqq9L1zCGlNJoabKk12zZ6lwvXWNi11W/D+CLxICW+YPinFI/dVcrEoffCw1r91U4qZkKk=@vger.kernel.org X-Gm-Message-State: AOJu0YwGe+QzxTXdRGFotKOxNxKGKy3Ufr8Jc5oed3CzJAMILE/M1Pxb EE3ZbEVOdDImjn2yB78vZwW9J6pa1HVIWx+VtCxUUDbSquefE3Rr/Hk6TlhRyAa+Q8TRFwf03Tj 4BGqNL3lRmX+LoRh33sPMPA== X-Received: from wmbz14.prod.google.com ([2002:a05:600c:c08e:b0:47d:5a60:18ab]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1f8f:b0:477:b642:9dc9 with SMTP id 5b1f17b1804b1-4805cf672c6mr67410465e9.28.1769424271028; Mon, 26 Jan 2026 02:44:31 -0800 (PST) Date: Mon, 26 Jan 2026 10:43:54 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-6-vdonnefort@google.com> Subject: [PATCH v10 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..feb3433c2128 --- /dev/null +++ b/include/linux/trace_remote.h @@ -0,0 +1,80 @@ +/* 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); +}; + +/** + * 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); + +/** + * 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); + +/** + * 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); + +#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..3d80ff98fd90 --- /dev/null +++ b/kernel/trace/trace_remote.c @@ -0,0 +1,570 @@ +// 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; + + lockdep_assert_held(&remote->lock); + + if (trace_remote_loaded(remote)) + return 0; + + remote->trace_buffer_desc =3D remote->cbs->load_trace_buffer(remote->trac= e_buffer_size, + remote->priv); + if (IS_ERR(remote->trace_buffer_desc)) + return PTR_ERR(remote->trace_buffer_desc); + + rb_remote->desc =3D remote->trace_buffer_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(remote->trace_buffer_desc, remote->priv= ); + return -ENOMEM; + } + + 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); + + 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, enum tri_type typ= e) +{ + 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(struct trace_remote_iterator *iter) +{ + 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; + 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; + } + + if (!trace_create_file("tracing_on", TRACEFS_MODE_WRITE, remote_d, remote, + &tracing_on_fops) || + !trace_create_file("buffer_size_kb", TRACEFS_MODE_WRITE, remote_d, re= mote, + &buffer_size_kb_fops) || + !trace_create_file("trace_pipe", TRACEFS_MODE_READ, remote_d, remote, + &trace_pipe_fops)) + 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; + } + + if (!trace_create_cpu_file("trace_pipe", TRACEFS_MODE_READ, cpu_d, remot= e, cpu, + &trace_pipe_fops)) + goto err; + } + + return 0; + +err: + if (root_inited) { + tracefs_remove(root); + root =3D NULL; + } else { + tracefs_remove(remote_d); + } + + return -ENOMEM; +} + +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); + +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); + +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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 BE2BD332912 for ; Mon, 26 Jan 2026 10:44:33 +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=1769424275; cv=none; b=VkkPG1tbt7hQTt0iO0fKVECOOrV3ScT37CriwaOGRuPqqJwbSQkWOj0jkwXWVJB4bmwPP53KA1/NkVprU5L7uGFK4U/aA1rCwZq/Wm4wZ/+VmaWWOJIDX367ILvlUqta77P2/yG17QWyxr/8QASgqA6t0AECcv6meVV29652lQk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424275; c=relaxed/simple; bh=vvi8qpGjNkMIPtIb6W8p79MsC1kM6v+aQRv35a7e8XI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=I5xbkJ4fXZY/i2Nxg5DRUXjYzExqvoCU1bxt2lvshO9e30sOrRFY811SKokbR1Fl3DEOyb6eU3+OJNkAW1Ndc90MmEznKGZe9haPCoJYfSlxpaXOD1xGlqBqUl9bkts/hvDwfomAknvdPMAn7VLvybV6H383azhh3bHWBRv18bo= 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=Kgqef0Rx; 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="Kgqef0Rx" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4802bb29400so77856825e9.0 for ; Mon, 26 Jan 2026 02:44:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424272; x=1770029072; 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=gO4YNQJWWfD/ARRZWKWkjPHJll8Owsq1oA4pi9BzLQQ=; b=Kgqef0RxAgHBFu/UXI7ZubC1HB9qv2JIo4Q0nzpjibJkiHNqm2KLnkufFX5qxAQ+o6 MD/NWfK0cVF6wBEVg+yBvbB/ScilgvBith4zbBLwsxo+xwzo5XwJP0fF/LSbsd1EgrsC 3A145UHoB/g/5g1Y4J1NnAbaPWtREI9e1z1P4MJPRIo5s/bIS7HjXe9FSPUBVxXBDQCX VT04palxaEl3pq5h0lFO3AR3Crl/xd+c/JPDy4NSjzLu0OwmEYeP0V0sqn2KF+1g69Yw XEFyhs+o1RiMq/vdky3944htOYKwswlCY93Bj1t6fMsdlQx2mEguecxTD3sotpqKFzfe 4TTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424272; x=1770029072; 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=gO4YNQJWWfD/ARRZWKWkjPHJll8Owsq1oA4pi9BzLQQ=; b=JAc74UITWJJ004g57nZUlPcNgL1R+jv9CniE6z65uN4d2n4kD9XW+ZcqiLs6TAP329 Dsm4MvtHBOZIEskzseae7Sc3OEOJQ2OAnIfxAQry9QF+NmSZ3/e1f5EpozkiD4nuT6Gw kf4ZI1vSy5sLqzrV+ELs41luh5DIW0TF/iDPgzlLEsXT56j0qv/pzmGfZE8G1gQrsbvL JNIlSeZCx1/7pC7hGqruu5fBLMMNzy/4mYL6HyUGSj2aidcq9Z3NRVDOdrsEcPIyd5Zg 3K411TfxCdEEXfvqvo0XaICOsjV3S+qII2NdU6KlsdfWMaW+v3mIswouOzCIlXZHT17K CHYA== X-Forwarded-Encrypted: i=1; AJvYcCUbAqvZv9qVZfloJY4LB9lDrk7jf8aFSyreBSY++exgV/KpLj4TFiNRCIfZQ9qStwePpyi8iHHmCbGjem0=@vger.kernel.org X-Gm-Message-State: AOJu0Yxy+kiD01GUK6Bk9nlO5tjEMYIJBLXcBxmuPHfKsrWgw9j3qS+k oT/CEybY2l7zAkSoexSs0iKaJup8RW/2ohX9BINCpIQUkvqRwSN/+ekUyj3IrYipCJdDNisEYbA 7iSprp0VCgqUQHuVPApz6eQ== X-Received: from wmjx21.prod.google.com ([2002:a05:600c:21d5:b0:47d:86c6:ebc9]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3e1a:b0:477:7b16:5fb1 with SMTP id 5b1f17b1804b1-4805cd430c9mr70494535e9.7.1769424272078; Mon, 26 Jan 2026 02:44:32 -0800 (PST) Date: Mon, 26 Jan 2026 10:43:55 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-7-vdonnefort@google.com> Subject: [PATCH v10 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. Signed-off-by: Vincent Donnefort diff --git a/include/linux/trace_remote.h b/include/linux/trace_remote.h index feb3433c2128..55754ef78104 100644 Reviewed-by: Steven Rostedt (Google) --- 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 /** diff --git a/kernel/trace/trace_remote.c b/kernel/trace/trace_remote.c index 3d80ff98fd90..49c4ae127533 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 remote->trace_buffer_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(remote->trace_buffer_desc, remote->priv= ); @@ -136,6 +137,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) { @@ -410,6 +426,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; @@ -440,7 +476,9 @@ static int trace_remote_init_tracefs(const char *name, = struct trace_remote *remo !trace_create_file("buffer_size_kb", TRACEFS_MODE_WRITE, remote_d, re= mote, &buffer_size_kb_fops) || !trace_create_file("trace_pipe", TRACEFS_MODE_READ, remote_d, remote, - &trace_pipe_fops)) + &trace_pipe_fops) || + !trace_create_file("trace", TRACEFS_MODE_WRITE, remote_d, remote, + &trace_fops)) goto err; =20 percpu_d =3D tracefs_create_dir("per_cpu", remote_d); @@ -462,7 +500,9 @@ static int trace_remote_init_tracefs(const char *name, = struct trace_remote *remo } =20 if (!trace_create_cpu_file("trace_pipe", TRACEFS_MODE_READ, cpu_d, remot= e, cpu, - &trace_pipe_fops)) + &trace_pipe_fops) || + !trace_create_cpu_file("trace", TRACEFS_MODE_WRITE, cpu_d, remote, c= pu, + &trace_fops)) goto err; } =20 --=20 2.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 85F93332EB6 for ; Mon, 26 Jan 2026 10:44:34 +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=1769424277; cv=none; b=OHg1XJ+eRSfq/w9oDMiWFGEJDQ8QenYW8wPS0EC7lqZ4kro6p1dbhjw/2rUeVmsGPsmZvzH362fMJmaS/u376dWeM8YFul03nhbIzAilkpkk5LtnsVU5zdu1oA6sNTk6BHl4SyWtYvBjOSMuG1GQ5g6RLcW94hgSnzewmFfM4po= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424277; c=relaxed/simple; bh=A4SUswLxTqL/tiQbGZQ8zhbUcVpGy/AgS2ATGMzP7EM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=i0H5bz+lSEEb6stCPYMnbaihqcs+qv3an7o2psSxzv+RSfjjbupiRkZilLE8VxM88rRmLuIiMvamx/3Gmydw73h9NG1r43s28H7lwvHPjBE1Oo2JUmmG8zCsxBpJIXs6Uu76yxwnlpEuW6DYL2UtAuAKBPRsVp7lC1UlHI6Ldsc= 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=UIDhEbTj; 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="UIDhEbTj" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4801e9e7159so37023595e9.1 for ; Mon, 26 Jan 2026 02:44:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424273; x=1770029073; 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=uTdj+e4Frc7Iw4eaBx3hEgvP+FSLOLysb13SdonsXT8=; b=UIDhEbTjrNRZWwE+MLdPaL2mksNHqT3XSOzCHCS1FhY0v6WIsTuIB6VKbL1MEY4oRW vDKHCDu0DDsv8tFK0RORZdEmW0HjSNXtltbY8/0gcT9uduoFQ0UrY3pFvW4KLvxjGB5v xyEoQhssuNxOkzEXJVFv3vXh4XmwcR46uWud6hoTN6Nuw4KTy2hYtJidNeDrpXF7uMs4 dpXqGR+hHQItPAeWG4xnfqoFrGeU4e2Orlqt6q2JtV2qh+Zq/9jbIr9f4K4Q1KrbSGVP vF+L3E4N8A5eJ5mRItzDujjhb5zkuuQ6aBPybu6UdI0Hw8gbRXhKULSalk3fGptkJeXQ Ol2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424273; x=1770029073; 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=uTdj+e4Frc7Iw4eaBx3hEgvP+FSLOLysb13SdonsXT8=; b=dFsWSpbaQtfP/82n1ojkIdLMop3HURpenUDYWAS9mS5baFzhcGlhzDSYFqHbmOkavX Za0czqtnpnvsO7cVhj8PisReiYWOOWrwL9zIXWLurrKbcWOtQ5d8qk4HSSTba3lFBc4z BY8y5BLjJMpyidITbFSblM3jvpQfPETwH2jw0c1wpeAnMrB49A38Kb9rwuDC5MOh+zkg t7n+Y34GbEJEsH8qGT/yrlaOM4ae90vokLJywJVjycQIMK9lEGcTL9xP2Z2pveb+NlTA NHwQ6vu58DIBmcbBuEZY4cfx5EQwwDz758MGSBBtglYJ1+SlehtNH/FksxY9kEm6Y1S3 yGvg== X-Forwarded-Encrypted: i=1; AJvYcCXz5oeF8KkBdI195khlCSHRQbISuMn10BD45pPU/wkgVL+fmi0zi7RZcXFkF8hCTjLOA2ymLLGbpJ9ykIY=@vger.kernel.org X-Gm-Message-State: AOJu0Yxvs+U2TMUZi9kVq4aF/Rbk9yDka3QuDpJF0iZVpgpmSs6SePXl vWKQXu7DschFSJuuO7yGnoLCmpy7vN4O6xEA+Jl9sXFTbdY6a+KwAC2l6bvvVZUncWM6le3Usw6 tSw4KQiWLHA4Ifk8D4SBqpA== X-Received: from wmoz10.prod.google.com ([2002:a05:600c:78a:b0:480:1b84:b6e]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:37ca:b0:477:b734:8c22 with SMTP id 5b1f17b1804b1-4805ce3fd1bmr64923625e9.8.1769424272911; Mon, 26 Jan 2026 02:44:32 -0800 (PST) Date: Mon, 26 Jan 2026 10:43:56 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-8-vdonnefort@google.com> Subject: [PATCH v10 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_remote.c b/kernel/trace/trace_remote.c index 49c4ae127533..a744bbf48e88 100644 --- a/kernel/trace/trace_remote.c +++ b/kernel/trace/trace_remote.c @@ -18,14 +18,25 @@ #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; + union { + struct ring_buffer_iter **rb_iters; + struct ring_buffer_iter *rb_iter; + }; int cpu; int evt_cpu; + loff_t pos; + enum tri_type type; }; =20 struct trace_remote { @@ -36,6 +47,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; @@ -225,6 +238,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; @@ -239,6 +266,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 @@ -253,6 +283,48 @@ static void __poll_remote(struct work_struct *work) msecs_to_jiffies(iter->remote->poll_ms)); } =20 +static int __alloc_ring_buffer_iter(struct trace_remote_iterator *iter, in= t cpu) +{ + bool once =3D false; + + 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]) + once =3D true; + } + + return once ? 0 : -ENOMEM; +} + +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 struct trace_remote_iterator *trace_remote_iter(struct trace_remote *remote, int cpu, enum tri_type typ= e) { @@ -261,6 +333,8 @@ static struct trace_remote_iterator =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) @@ -275,9 +349,21 @@ static struct trace_remote_iterator 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; } @@ -301,10 +387,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; @@ -314,7 +490,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; @@ -329,7 +505,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) @@ -343,7 +519,21 @@ static bool trace_remote_iter_read_event(struct trace_= remote_iterator *iter) return iter->ts !=3D U64_MAX; } =20 -static int trace_remote_iter_print(struct trace_remote_iterator *iter) +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; u64 ts =3D iter->ts; @@ -371,7 +561,11 @@ static int trace_pipe_open(struct inode *inode, struct= file *filp) cpu =3D (long)inode->i_cdev - 1; =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; @@ -406,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 @@ -414,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 @@ -426,6 +624,119 @@ static const struct file_operations trace_pipe_fops = =3D { .release =3D trace_pipe_release, }; =20 +static void *trace_seq_start(struct seq_file *m, loff_t *pos) +{ + struct trace_remote_iterator *iter =3D m->private; + loff_t i =3D *pos; + + if (!iter) + return NULL; + + if (iter->pos <=3D *pos) { + do { + if (!trace_remote_iter_read_event(iter)) + return NULL; + + trace_remote_iter_move(iter); + iter->pos++; + } while (i--); + } + + return iter; +} + +static void *trace_seq_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 int trace_seq_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_seq_stop(struct seq_file *s, void *v) { } + +static const struct seq_operations trace_seq_ops =3D { + .start =3D trace_seq_start, + .next =3D trace_seq_next, + .show =3D trace_seq_show, + .stop =3D trace_seq_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 RING_BUFFER_ALL_CPUS; + int ret; + + if (!(filp->f_mode & FMODE_READ)) + return 0; + + if (inode->i_cdev) + cpu =3D (long)inode->i_cdev - 1; + + 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_seq_ops); + 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); @@ -443,7 +754,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) @@ -532,6 +847,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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 412EB333424 for ; Mon, 26 Jan 2026 10:44:35 +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=1769424277; cv=none; b=Fq+Jw0rcm3s20TT8YsA5oPBR4EdeHgmb/mZ6mVNsXSoFq8KCW2691vLpfaGC940d+2ko9P5NOhvOOH+89Cabf9xZ2xb8181RmFRKDhgJ0e+RdI0sMIGY9UlIKaI2CsXY03JvMzeiItoGvSW3NkVp3ZTeXZX/eh/2jDDIeps7sJ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424277; c=relaxed/simple; bh=iaQ0yA4R1YMjqmjGhIBLQinGbFMCowT55FHzF+/yiYg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=YcJ5IYIBXx+wIJWfDtwMHoZETKfdjpM2GGoKy5PSNCQ6T4M70amHgh2gP9Zy0F0dwRShRxZizCB2j8ke8YRxXtce65F0iqAN9pFIzha8EfpI6BlPGtOFXJCwAtYxqmhJYNffapvK4iLzY+2Td2//TxQZsaM8LR/PDKdNtuL+4uo= 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=UucnxJk7; 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="UucnxJk7" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-47d4029340aso56591925e9.3 for ; Mon, 26 Jan 2026 02:44:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424274; x=1770029074; 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=L2udmx+4SJHsFMJWVRdW8n/HMzlAkQIzlTSPPm28eNE=; b=UucnxJk755FU+8LGplbEKz+XWGnzY9/4xoZoSkofOG7eQfqQ34+xT+jnBPHk9hMK6S Djt3dTPqrZKQOA5EDjxNoyQMVtieu4HJBWh+kHcbQ18DM1EmC3gwAcqbQ3pDqnJ87HA5 F5kFDpETAieY6nCHHgomkO01dnOz0LCUWgHVA+0YyhJnv7WeZXpPxYSpOgWyTxMG4Hi5 9jMcabBqAt/JFp2T4k4V/H9RMMs43plbNImtwNe1r2Q3htqH1FwKlAEYEPTrvaXaowDf 5DpwnYWgHGmpSovri+sjCar7e1/0G0Kf6K3preVq71+ZlqO8nBHh+uj/IZJUxhHvc484 7U7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424274; x=1770029074; 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=L2udmx+4SJHsFMJWVRdW8n/HMzlAkQIzlTSPPm28eNE=; b=RZdXZbbZYMLQFFy27y+FOljDDUXSx9ZOQYQ5U0fKgZzFX/ckLFIccljQK2i8rp13J4 JuenWLmsK4BEAGtQgpzheOn3LXUU1f6yxN8qDm/k3svciKQ0XFDFKZRnnyNei21QUaQo zyLGX8f2Z/kH86GNG5Q8+3Rj/fNGpu/AVZmuTULfdB6yU8b6o1lpp977kEWVIJO0D6+C aLOdDo1eqE9nZ1n/IvlWS90VW/kwKxBW0/6sLV3G9Vs9EJtx1eBIFc2KWXQskRDdwPo6 QMDONX3eXtm8l+9Vv6e9mIJRAccyVbBUxEAKXXABept5bmO+62e3CgRQzuDt/Eiawyar cDAA== X-Forwarded-Encrypted: i=1; AJvYcCV9sPhjIUVQ8mx69o3RwzqJ1YWEUqcmbJlr9qeDhNNw5LcZms+isqY0yOQFVMEVQPimx3Bdqy/09SvnMnU=@vger.kernel.org X-Gm-Message-State: AOJu0YzoTyPouSypHybZcGzoOv0U1DnnmTfcra39hbCkzhMYLdbe4xVR SKCXbmYK7vC0vccBsYlu3IOpA2RcT5gcciMTEo89h9JEcut+NnRcKNlmI0qS8jNxNnQK7l64kkJ q16LjkxkXLaUhz92duDegUg== X-Received: from wmpk39.prod.google.com ([2002:a05:600c:827:b0:480:4a03:7b7b]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:500d:b0:477:7f4a:44b0 with SMTP id 5b1f17b1804b1-4805d06c44emr66099755e9.33.1769424273803; Mon, 26 Jan 2026 02:44:33 -0800 (PST) Date: Mon, 26 Jan 2026 10:43:57 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-9-vdonnefort@google.com> Subject: [PATCH v10 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. Signed-off-by: Vincent Donnefort diff --git a/include/linux/trace_remote.h b/include/linux/trace_remote.h index 55754ef78104..15a579633123 100644 Reviewed-by: Steven Rostedt (Google) --- 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 a744bbf48e88..924e3f3ec6d2 100644 --- a/kernel/trace/trace_remote.c +++ b/kernel/trace/trace_remote.c @@ -837,6 +837,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) @@ -854,7 +855,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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 77F0633373B for ; Mon, 26 Jan 2026 10:44:36 +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=1769424279; cv=none; b=XWpnlCsD8KWhK0isunJJGsybp5ZFYupPHcSnccMcbxVGhuCE9R6EtspwMKrMeFq4d5E2BYIZfKBQytzy+MPkERR9gYXloV2iqzYR+DsT+BbCC4pcPAObPD/fC7SAVMuNHXIPdgmB2HCcKcjKMOmrTutvpS832WY1rz1s8B95E28= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424279; c=relaxed/simple; bh=bt4AtlVfv+B9c9mJjNo3bM1+scGC5mLx54Znb+gSUxo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=acxLGEhkSjKqCwfb/RrxQ8OC7i2IoVaiK+soDwYggXCwa2hZHIoT3lspuGs4WrnuAfPlyodZEyIhDYrrpeVjIUP4GFZuQvzv2jgqbsayM5YdrPb0ID030jPv0xfHIGA60qGFyL4cZzTflpLgciEGu+xBakCEMuuIaMj1sHeTZ6s= 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=rAGBPT2i; 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="rAGBPT2i" Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-b871328f6caso49898166b.3 for ; Mon, 26 Jan 2026 02:44:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424275; x=1770029075; 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=fV93r1jNcGCBDMto0ESTekvXBiOG+cNH5vkB4CahEyQ=; b=rAGBPT2i8jilkdpfbjqJiaYJPZkPECYD6qkUhyhiFb//q4Mbrl08eBbCaeRV9tmJHE khlj7fHsTt3VlqT8aIcZbk64hPMDCXDe/cLUNoDtESZyKOYMsghB+EQDbvS3D2KjPpi/ 9JcgJQkZcqQ4IZ+eVlIe/LgWOCHEeqRwVVZ/Aff0f1TKoB0tsEQDw9XA31FFrxSJqF4C JcDZBamk/GNLwp0TNPyPVMRVIoiai40b0ctdFUVvUQih0HImhWhugHbudZKVchBcC5VY KbVaNpuid2ZBJthhMm06/DdZDf/2tbJ6eQi8cGI45wlghkOpuyvP6uOorY60lclXYjBz 9UGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424275; x=1770029075; 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=fV93r1jNcGCBDMto0ESTekvXBiOG+cNH5vkB4CahEyQ=; b=hdRIM0WdUxrCIpsXTt+4/54uaIjUHgCxkT+Fkpmf/i72KGIz4xEhfoJOuLzpfmOa9L Aoodvc5XCNmQAcZ6XlbcC5g+HMmrA61Jjhm1UYiU9pIkciMN0nsAdpN41UxokxFDEwoq esG39sf370KkI+Ak524csbj/88mznvQBUja4LfE2OfZOQswmWYsGsvryCaCh114Gb/5v pBICxlHvhAjjfNNbTTRTlMlpHOrnmNbmxEFqXXwooohDrk1aRws016OEEZU3TxQJaZLN MolOQpOiWtyhbNUgt9e8bt1oolRRlrtmAQPygxMGpYm5479Cu5ewhOuRy/51s2uwvHPg XBxg== X-Forwarded-Encrypted: i=1; AJvYcCVuxHE+z5omFkL1CqlmxQ6bmaG0qSsOSuPWfcj3Xv6cxDe+BeAPE6LQvh2ZdQW9fj2EnB044BM1DJcxeZo=@vger.kernel.org X-Gm-Message-State: AOJu0YyI+GNnWaXbmSdblXzqFsXdZWT9xyDuzN/wne1zFmrVWSiE4I7M 5VKcIxQg9OVmsA617nxcTQjwUUipYUY697jDna5NzMZgjAANzjNfafFEMMYTdWm7x7BiQYW3+jZ fPtq4PfoHCQBWbYOCkE0Nyg== X-Received: from ejblv8.prod.google.com ([2002:a17:906:bc88:b0:b87:3485:db4b]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:9686:b0:b87:1839:2600 with SMTP id a640c23a62f3a-b8d20e2938fmr286088066b.33.1769424274617; Mon, 26 Jan 2026 02:44:34 -0800 (PST) Date: Mon, 26 Jan 2026 10:43:58 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-10-vdonnefort@google.com> Subject: [PATCH v10 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 15a579633123..456df837fc6b 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,6 +35,7 @@ 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 /** @@ -53,7 +57,8 @@ struct trace_remote_callbacks { * * 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); =20 /** * trace_remote_alloc_buffer() - Dynamically allocate a trace buffer 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 924e3f3ec6d2..8527804f2d22 100644 --- a/kernel/trace/trace_remote.c +++ b/kernel/trace/trace_remote.c @@ -33,6 +33,7 @@ struct trace_remote_iterator { struct ring_buffer_iter **rb_iters; struct ring_buffer_iter *rb_iter; }; + struct remote_event_hdr *evt; int cpu; int evt_cpu; loff_t pos; @@ -44,6 +45,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 @@ -484,16 +491,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 @@ -505,7 +515,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) @@ -513,6 +524,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 @@ -533,8 +545,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 @@ -548,6 +563,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 @@ -821,6 +842,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: @@ -834,7 +857,11 @@ static int trace_remote_init_tracefs(const char *name,= struct trace_remote *remo return -ENOMEM; } =20 -int trace_remote_register(const char *name, struct trace_remote_callbacks = *cbs, void *priv) +static int trace_remote_register_events(const char *remote_name, struct tr= ace_remote *remote, + struct remote_event *events, size_t nr_events); + +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; @@ -855,6 +882,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); @@ -929,3 +963,220 @@ int trace_remote_alloc_buffer(struct trace_buffer_des= c *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 *id, const void *evt) +{ + return (long)id - ((struct remote_event *)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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 78CAA3346AD for ; Mon, 26 Jan 2026 10:44:37 +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=1769424279; cv=none; b=Gs5dHK12HcyJ/55cgZMTuLr/4jy6NP0E9aYB+EHxWugn9nVV6gV+saHdRRRfA8p9WR0kG/pzaM6jUx2oH6QHjugRcSlplYMlSWfsEm5YonmVvsk+hRF/32MUdbUYGdccurf54UDWQ/zdjrMcg8lwGZxZx4XNt5TrbiQf3XoJITc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424279; c=relaxed/simple; bh=1IMerFTPDsdaMH4sRfLZIFjJeFFrcEnNMSm0u7nOr9g=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Vop/pGc+Q+m960urYPwimIqYtO/zmobx+vsMZJrD+k0bJe9FMcosn13LrSVSj5DSPKH4CBgqP62nIzSvEE4EfKbxb619uQal9+Z3OUPXZFc+MDMIthfjfQW3xgkI7Uv6UeWZRfVyj1jzMefIYgT9Gq+FyNkU/I5k37B/J1+xOyI= 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=w79CTUUK; 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="w79CTUUK" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-432c05971c6so3233194f8f.1 for ; Mon, 26 Jan 2026 02:44:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424276; x=1770029076; 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=7YJRP+G3rcImUrxUFghhwl9H2MwKFHCz4aOODu5pyqY=; b=w79CTUUKCXKp6vaafCVQNIrAi7Yq+sup/VpjEsJv8I/zlydC82fhU7VmKTKr/LQDCq 78ACAdCIidOWTDyqyUVf28C/AcaovZUTvMKYdsJgoR5Qrwhcise6vMTfRfJpoJ6CWfWt VpUjtHcERGR+5Y6v/x3Nss0hum90r5nn4n5HZvIrrM4Swgag1upeaYKkTzVqLu1xe0ai tuo97xyRDLPAzmurbbu4mxx6TNZ5uoZLrWJSCADzl3tgMOuZ/3Zit8xIxZXOkvNRFvmi IZ4wvTnlLxJu6Knar8cJEZgDKgkdazttNsi+lqrnN0ZYD1mTQEpVQ29rAEvdak1iMmJu SOww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424276; x=1770029076; 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=7YJRP+G3rcImUrxUFghhwl9H2MwKFHCz4aOODu5pyqY=; b=LyVISa1481Bs9+uBRVDREDifkvv+t7XclgMn3KyZDxMgq8u+65hMgrefwnZBb+HRE/ 4M8tPOZitqkOaMQHNsXYen0buYIVmA2SaWfkrkT+1uHKsXbXHqz+8J869YqNNIuYvBMF YRLNv833I7ilyPMFpYHQS4qaOewPYRkYP+tcEqQgHZbwLbRP1K51RPQxa2QUIl1EaXFK 8gSTyHYrcfeLRMHwFyMA86CcBgUgEUzsWBdTTA51zLizLY9WAY9jS+Hn0IqH92pcExbQ QeJsKDXeeZQCJjkeNh27dV9fCwncDBK7444Y9f4lALlb1/Z3hYyVAXiKSghuDQu/n1It HVFA== X-Forwarded-Encrypted: i=1; AJvYcCW516l57ZFPNqWkcJddKH9SXIxbcsp5pBuPqMcuOYg5m0rY0FD6IWe2iVPHPVehODK2Vl+kdxH28M1g6P4=@vger.kernel.org X-Gm-Message-State: AOJu0YyxFIz8zJO76loeVosvRV7/rEn1gymbHDrdj/UACGRCUY0KdQif feC/S6nob0hCykZ5q5Ya+6VSJT7iNtDpGD/K9vhiLZghEr5BfDuA3FEHC5E9aRap+yBx8Cx2fho nY+d/hmK5vC2DsgbE2LpOGw== X-Received: from wrbcm18.prod.google.com ([2002:a5d:5f52:0:b0:42f:bb9e:9b09]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:1449:b0:435:9336:21f3 with SMTP id ffacd0b85a97d-435c9a9c00emr6590304f8f.10.1769424275822; Mon, 26 Jan 2026 02:44:35 -0800 (PST) Date: Mon, 26 Jan 2026 10:43:59 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-11-vdonnefort@google.com> Subject: [PATCH v10 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. Signed-off-by: Vincent Donnefort diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 2d08dd326309..e28cc02d1a70 100644 Reviewed-by: Steven Rostedt (Google) --- 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 8527804f2d22..e54cc3e75dc5 100644 --- a/kernel/trace/trace_remote.c +++ b/kernel/trace/trace_remote.c @@ -1078,10 +1078,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", @@ -1097,7 +1232,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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 1FD363314CB for ; Mon, 26 Jan 2026 10:44:38 +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=1769424280; cv=none; b=hcifwZQ0DfyY+7gJhZrL41xnqjVcT42Oc8kfBtMrLlrpZfnGtHvYxXiU2E1/kdyd5vnuBXbCB/ztO9TUPJQYkYneEGloVrNhPOnmdlGZAtOQgdR1b42sT0P9MH5loTy3qGOvQvUc5CbFRPXkWIcDNv6IkFLypu1gVbTtCfj3IrQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424280; c=relaxed/simple; bh=ojWH6wLlvx2Q/qChZ7rj5LS3D3RiSCBq1QSUEso5Js0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=SOilPCa6k6Xl/kjfQu/hQWeqSKpbzdAJuc4qI4q4K93Sgg/HxoXR2OyXPpZx+j8XSKNr1kDUvyymxsIiqwpgJkOxYf+rr8Bt/8xltiRMuXuWgU0lWIL8xBUdSwz9DNM9VLMdu+i7zcm5TBVGqQDf2LFguCu8vaVzBQl5eg3toWc= 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=QJq8baxy; 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="QJq8baxy" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-47ee33324e8so33354535e9.1 for ; Mon, 26 Jan 2026 02:44:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424276; x=1770029076; 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=eBVdHdK5pnty3kUjGmHkkia8pj/26sMijHr3rT8k8L0=; b=QJq8baxyeDO6PmQcHQZkjH40QkISw38r6guFWKFvzpluwvnLvu4SBGVXUWM83IVLg+ C6V4ywYyYsS99vK3Lw3xm2Qw7tkQ/Mw+IXO3XWrFYDHsgxdo0xchFzkEnVjzGJpF2bG/ UX72e/YtasqAq7xU8BDPvGSbAko2JdQwBiwjq5+3U2lmfc+Z6hLfNGmlIMBCqjf7Z/u8 wz0dLtCcUpaGmnjowc+qQzwuQPhm5SUi1eckD2qAnBoumZwbNdG7ima/jHNoOQCpBTc6 em0m+zCv6Nhb/nZvAGDzlBuKscrKc9kBoWLdQmnCloJGhiQVt/JOcZqL+UqkTGDd/Hey jooA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424276; x=1770029076; 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=eBVdHdK5pnty3kUjGmHkkia8pj/26sMijHr3rT8k8L0=; b=SP3Gkhe5qab/aEMxa5NIMH1SDW7hz4MIH4dyTXxHgQqmX1V899lWW7Fc3BD3w7Occ+ Gftcat+CRhyxnbVkEauDaOltDadQdNHOBQFS+mqZmXrqQei+F8Xvf0LT+01J+8lSQtDo vPXa52R9GfRHtUWELX96dB1Q5swzZ4NwRIWL4kI59mFGdu4u9KT5AGyGXxsVpXUkqpE8 o7rfOoRsttr/gl3N858MAnQEgmDtzGxYPsAk92+GHTZHUObyN9/orjlAewb41ac9ZVhe 4dZym6rx0XAtCAdb6IS+t2ieNPsiJ5pZOqT9f5ml0p7cTiNmlFG42SCEB1UEFIjB934x 4RUg== X-Forwarded-Encrypted: i=1; AJvYcCVkN0IrzEOMEMWcI+s/mVFme/sT/STY+wfCuS2nsQuAMOseJjfd6Uzv2auS6PpwC0Z/dFMxze5WVtDbumY=@vger.kernel.org X-Gm-Message-State: AOJu0Yz67C+7BWn+twN3KqQhX7gZECkhx3/Lg5YfoU3PaaWJ+2jkiC8X gqTukQGIEZeKiHy/rj/UKO5GGD/yXjWkmvAzA97PaFCqBDMF2YtjquLALugpGFS2n5LGAJoOhAM SgSIOIGLKK1kgUfNFZv6rNQ== X-Received: from wmdv19.prod.google.com ([2002:a05:600c:12d3:b0:47e:e953:a478]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:a306:b0:477:a246:8398 with SMTP id 5b1f17b1804b1-4805d9664aemr50974305e9.2.1769424276747; Mon, 26 Jan 2026 02:44:36 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:00 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-12-vdonnefort@google.com> Subject: [PATCH v10 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) ) 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 Reviewed-by: Steven Rostedt (Google) --- 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 DC6D8334C35 for ; Mon, 26 Jan 2026 10:44:38 +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=1769424281; cv=none; b=PLpNUa/DGRTti+FwZPY/5MLJIKi6Z8TYId71iM5w6eJVXSpGNravD3dKQdtJuZFO0pDbEzlu1J8WnoU+c1WO0o37P8CBRD1p4NGMaf4lx2HvlzZ9vhCTjF2hpGAgtIZPOLqbIeT6fTkcAfl7GH3MrxRXWnTqsAVUzKimEgORJRM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424281; c=relaxed/simple; bh=YBG3RErIYnviC9Pazfvtv29ZXxidGWVKn1TNI2i/43U=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=iJJ/RW7wEBYDo4rUmvRfXXlFtREE6JoPHigvY9mDqNOPJGmfLWMjTcasRfjO2jeLmlfBRvm4/zvRbQSyt6d+Si+BV6K5wk2GY5hM7pRJ/6cTX5W6vmf2pA6iRrKCiS0fyE/93vHrUaW0+T4g+dZsaOqes8zHrhn/T3Up6QfNK30= 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=xbLsSSmx; 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="xbLsSSmx" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-47ee432070aso39429155e9.1 for ; Mon, 26 Jan 2026 02:44:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424277; x=1770029077; 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=50GtyCfhZA0ASzmURRjSSwSIVxf8CTEjU89UFjgW1Ow=; b=xbLsSSmxyY6pruEUblIT4i5RJpLkA1feCJf+zdJK7qLborqlcHCdSUroo+29dX111d PSh0jmBCv0zwppMHitxEJkb3hTPel8vUfhjmgtfKCbJDrUEG2YnKH7dVBrlUSbQ3rSPq YdXGYukHvjG8krkRC7+p1tPV9dkn34qH9lcPrRO3NmJnQukVWPMvgfiJKVymkBpygaF6 1PcpWmUT/SOdC1DGEdFjUUhBgHgkqtqRLvX5sk/L8h02qdQEAUmNL8zb2NfecmzXGbCs ZKmByalhvxmLfWpbAUQW0pp/dh2T1QWYHubfzRkW9wB/FWzZmGCWij63gbMEwE6Rdc4E XsOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424277; x=1770029077; 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=50GtyCfhZA0ASzmURRjSSwSIVxf8CTEjU89UFjgW1Ow=; b=MCw/aqrtaUM+MmoabZpsvJkHnuQckbx+S0mdmRiNGEkTx+F/NS6IchqMDZgBOJGTk2 gkn2WOHR0kReNXZluLz9JjvyYkNCKjbRwIUfxvWXbzTR/KfUu9zkHQfa+/LxvwTnOgpt 33vPcvSGxYWaf9RRjzXCBqb6H7aIQX0IoOfm8XFRQziCIpnb5DzCYP3yYhNCM41sxxnf bBR92O8tH+8i6kH/YW3dAX89oXEK4F2B8HGHLdihPyYkOGdqcFjJ/ABnnISl8t0LEyXt U97GTgKajJwAiTS4gtjbsuqjcBxGcrnf/FpJ11IpwTs1JFiY0wiz0p0k8W6xP7Y+VUI1 6Qjg== X-Forwarded-Encrypted: i=1; AJvYcCUt5teqIgD+l/Nn6t/7sIiBIRQpNaa5GQ1SK6hIiWV0nSIJsf2zZlRLXwvFql8caK4nMzUbe0Isq2pqoaY=@vger.kernel.org X-Gm-Message-State: AOJu0Yyt6eR0L8oGEwzFkaN5DvqVhyIH7C5ModmxPPV+Zl9OAPZJSweI BVOPUjNeNuTzdC17r4vkbjpI/VUNixtD8G4aDIVHhWw5sFNmYlyvaN+SQYyjC44QOUG7KmxEUPV Sukje2kX0EkdK9J6V+nt7xA== X-Received: from wmne21.prod.google.com ([2002:a05:600c:4395:b0:477:a181:1922]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:6218:b0:477:214f:bd95 with SMTP id 5b1f17b1804b1-4805cf5ec98mr68988845e9.23.1769424277479; Mon, 26 Jan 2026 02:44:37 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:01 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-13-vdonnefort@google.com> Subject: [PATCH v10 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. 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 Reviewed-by: Steven Rostedt (Google) --- /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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 B85E3335077 for ; Mon, 26 Jan 2026 10:44: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=1769424283; cv=none; b=ubtcoJqeLlxq4KK64kPWYhfNygh9wlvfxfQIVmIjdmyhPjAWWMyCn3XG4SjKUqpn8cNe53f0TlK/WpFwFrnepkwxGb63zRxRxw2nJwi3ol2NpmKTzmPHq5wmUrkMp7Y6SyP2ZqJBVbakJaKY2fGTqq++u83mm07hmhngYWdo1ZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424283; c=relaxed/simple; bh=gp7F5cD+kYeHWtUIfcCipQxZUN+sI3O+EG7SJsSJnPA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=C8ZwMlqRKHECVpkZQRisqt2Y1wFuvYoUVXCy1X+jpSptsQUAdwgI1CJpgyqhaBE8ClbbA24FG6igkYgb0dlAd5cRjNsODTyTvgCvVqgxOm1irpWx7g7iBqeRHYtj73J4HtMhhfxFDF7prrz6iMRufmDFyZ8e4D14aFRIF/7A3Mk= 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=K9zYIJQP; 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="K9zYIJQP" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-47ee868f5adso45986195e9.0 for ; Mon, 26 Jan 2026 02:44:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424278; x=1770029078; 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=JYZiWMM3wmPHmhb2wXGAbmbPsN3SxiXynR3jqzU+/ns=; b=K9zYIJQPCridnnPaSznr+u/R0Ml1ByvhcpyFFiz0LI7l7uVQ6Tq+djw8zOz5tszJrR /FzssvRQ/7LviICjHQPUFQjzIge0WflYGAx9r51lcemsNjrQFAOd3FfWspyfqmxVXJWR ogVbV+oGNTvoaunwfrAi6eUs6c/bdics5IV6ySjvfxXQMoAGYq/wqXLN5ATLl0qO/V0J tO7jpGdFRbuOJu66UWkYQ9gFbkUeu3hFEY/ZYmThtckgPqAuoCa/NBnKP2Coc/zeKklN /NQwwQGrZulVb7wmNgbMqUYXNI20pjv/SHrWzSqB45OJGOyjBKrac2jMvLLKEsa4s2vr hU+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424278; x=1770029078; 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=JYZiWMM3wmPHmhb2wXGAbmbPsN3SxiXynR3jqzU+/ns=; b=kFHja7c61LJMuhbpRcPb37GBwfXtz72/kpg7Bddtdqn4V6DSEtGDW/eLb2/PhZZcmp qKaXcTIy9KRTW9BoOYTCvaianqRO5JbH6BC58slHN+0f6gTOVqCGT1XtKvqzyfxzquIl 1Vy+DsNUqPBPxTwQfSQGDESXhcMZ1MVVvw+w9n+aJTHho4XOepDtLtVYR3Ke0oU7XUmY ZVa2zVg6s1cAxrjMIq8BniwEHZhoje8FPAX8kQ/cLJkcUn+6DhuV6I0nsxr3ZhnpTDZf N9jFd78qNgVXnIlcnw9d9j+86r4Tm2/wlU9ANfoYMp95WmloJteFUdD1Q9tlvRuZz1uS mbeg== X-Forwarded-Encrypted: i=1; AJvYcCUwb7oJMuqSazN9VKoS7jaAMVGMibocSxFTwA1W3rtw2/FRNeCURhiB3d4WgbPlzJ1V2SoM66ZCPpFtkWw=@vger.kernel.org X-Gm-Message-State: AOJu0YyGXTHu8a6AxXGxCBWAp/6y/7TP1qlQ7HZmOnZtd85tzUKIJ4Tf MJgHTy1j9Ni6Qas4Zgn2XhDpXLw2YUbJy2/jYB14jlRmM5pRONXdkZhc1F6GDcN0OrWVzlfTJjG oN6PIpIPSe+y/vwkKU/mpCw== X-Received: from wmxa6-n1.prod.google.com ([2002:a05:600d:6446:10b0:47d:5dae:74f0]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:620c:b0:477:9a28:b09a with SMTP id 5b1f17b1804b1-4805ccd0f58mr69070115e9.0.1769424278162; Mon, 26 Jan 2026 02:44:38 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:02 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-14-vdonnefort@google.com> Subject: [PATCH v10 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..f324df2f875b --- /dev/null +++ b/include/linux/simple_ring_buffer.h @@ -0,0 +1,113 @@ +/* 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; +}; + +/** + * 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); + +/** + * 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); + +/** + * 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); + +/** + * 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); + +/** + * 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); + +/** + * 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); + +/** + * 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); + +#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..1d1f40c8c6d8 --- /dev/null +++ b/kernel/trace/simple_ring_buffer.c @@ -0,0 +1,415 @@ +// 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; +} + +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; +} + +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); + +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; +} + +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); + +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); + +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); + +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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 BF8ED33554D for ; Mon, 26 Jan 2026 10:44: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=1769424283; cv=none; b=f9Fqb9LxgT2oNwJlcO1WtpWp4/3PSBsF3gHRui3YnxZ4NG7t5mYxKGr6io2kqvLFBoCI5b36XlqADJ1s4vHTE5mYMu9ENbmOf0mu2KXxxCbNl59Jefy5nMcTamW6apdfwJW2FC9UIZ4xp6Oo76cZrnvutwzZ7vMEfiU8SwV/Ee0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424283; c=relaxed/simple; bh=bPFRL692BOvU5DvpfyFvfhyxsnSIaPLNNQFJH0MR+7w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hulgNuLvlcS5UhyWRpDAKlGVDuyx+23Lbhv/ef7g2VSC5aJBmYOHXXZZ4fvb6OoKzuPO9j407kJZa6FuXLIGpTNt43dlGBdeh81bbluCtkvfkhRtoR2Q7e4Z1yJ2Z4sP3OZD0TWPY/XQvYt/ZMg0IKvyCivoxSt9JPWclkUTLBo= 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=WEnzkRax; 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="WEnzkRax" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-47ee868f5adso45986435e9.0 for ; Mon, 26 Jan 2026 02:44:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424279; x=1770029079; 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=bTaG7ti7EadExoRYTduoC20Wwf7BQw6/YXyO13ReAkY=; b=WEnzkRaxAG4Lw6Thwvll6HAj+Wvg77ST4ZP2uiEHlUOK2dCNeF2LxWwlbI/rplvPvy vJftew6OvGnL3Wu83NogRzdmCH/xBMECfGHzhyzyMaokaE9Gwh1O/01h6SSXVBhaxZL8 UL0bvzOEHAvxJFJWwuAqNFwdz8tsGyPEz6UmG0qPJu6jpaf1nmzrCbVmzo50Dn/6M0T/ k/o0kcfEM6M6eb5jN8DJJcBNhKx25LkQasEkxSx+PL1k2kc9j0oKf/+gwOJJ41VIUQB/ /bK/gfC0vP2YX7Ckt2cdmclaGGvS1LRd7OhjiFMpjzPHCiRKOlolLtUhcRMoaUCOtQXF RSrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424279; x=1770029079; 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=bTaG7ti7EadExoRYTduoC20Wwf7BQw6/YXyO13ReAkY=; b=kw39OvfqxyO03KIhxaFqhRIz2GjtLvhxY1gPs4aUxTnXFdleCSYUgrvaKk3EE6r6SS 6W6N7kCyhrKunqKY6VrPipc6SVBYN2svgqqre9K2Crt5wp/C0kuOrlkQEUJPM4Wx2dNy wss8mtfIDSZWxuBtBzHfgFESsqlAOPhYy+ntWk4+kYvStCRWVrYW0ajHn+3CJyG50RDx QsVFydmQuHHip+4oExSM7+g1h9PFQmfxfJurkPlJHAC/l5o1c/A0T7H5Ay1NaLgRRapU t+Q41YiKXQRupaN/gbWipap/x9SrDk55RpBi22koONfuyFK1M9d20g22CT2XHjxC7Kq3 aZAw== X-Forwarded-Encrypted: i=1; AJvYcCVYj0vCI9qIyG6yWbbeUPOwNSCNYJzDweQkrUEtXuUfSukicSbEfc4fpVVHzGKKLWKzKySjSZuP04QzhLE=@vger.kernel.org X-Gm-Message-State: AOJu0YysV/cfT0qs2+tcWJx1GI8smEv2Wf/r1eztYGE1TC4NedLlhxGk l3fphfrWbFvipOkj3Rm05oyt1nNBvlzabNW8XEYd0jdFxyUIqkYCUUkvFv9avMdZBP/qd6Bledk i/5P05hbI0Q993ya9vuNz+w== X-Received: from wmjv4.prod.google.com ([2002:a7b:cb44:0:b0:480:2051:60e1]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:699a:b0:479:3a89:121d with SMTP id 5b1f17b1804b1-4805d066135mr64170645e9.36.1769424278959; Mon, 26 Jan 2026 02:44:38 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:03 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-15-vdonnefort@google.com> Subject: [PATCH v10 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 --- 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..059127489c99 --- /dev/null +++ b/kernel/trace/remote_test.c @@ -0,0 +1,259 @@ +// 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) + *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_unlock_cpus; + } + + desc =3D kmalloc(desc_size, GFP_KERNEL); + if (!desc) { + ret =3D -ENOMEM; + goto err_unlock_cpus; + } + + 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; + } + + remote_test_buffer_desc =3D desc; + + return remote_test_buffer_desc; + +err: + 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_unlock_cpus: + cpus_read_unlock(); + + 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; + + 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 64F8B331A70 for ; Mon, 26 Jan 2026 10:44:41 +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=1769424284; cv=none; b=h8Po+hmH9l0rLioUxJRDA4xBBTWm90tcotjRZuQpxgrO3QF2yFRIAPWAm+wtM+w+6TXYK6DKlGDEdQDnuMfi7UEt2sZzf6eHdmIg2SLf2GuVT9wAxO5sCnfzFFulDIk9evoNVxS8UDjOGO6zrV1blKYH16QAUTaGg11XQb3fVKo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424284; c=relaxed/simple; bh=9upPib1qMFbXgIJl0wvxchFNs4GCbBpNMzxfvk7ALzk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ep5JU3+MRsMAty2clUjgB92Lw9dPILs/VrNoXRnukP+GwRJmjRJ7DEdVdDQoQ2vshdvtR2Lvg8w7B/9bLMXbV829z7pibZRlBwxyspz4Ot1r29sNu5zxpBFSx5vl4h4D/IFM0pYaWj/CtlSamIv5EIgOqTU6/nlgIsA4f7V2Uh8= 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=DatdQhv8; 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="DatdQhv8" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4801bceb317so47142495e9.1 for ; Mon, 26 Jan 2026 02:44:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424279; x=1770029079; 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=ihgHPvo8f/5WhF8dueYUfBg8T3cvilAtVegxJbIQf0Y=; b=DatdQhv8xkL6KosTHyCSDftzllFn4ACVqxd9HJx9YNCbVyOSxwYjB56XPzMNCCpoCq QvDGxyRLeFkM1IVEV6KNnd88jyqlEA92VnA6Y5lH8G/qJ+MOMIAl8ZHgSqfUM2EBXnGu bG+4sFA+knPAPY8okfS+jmCxBOj31PNG3XltNIRPr9u5Kte3+qCCa3LOa0EUJ0G7too6 Bm5mRr7myRxjVo8s7Juoxsljz7LA5pbSCKp4u+IqZiX8+aMHPxpyBlYEEVlr2g9hTSU1 QDABLcq8zw53I76gKbZlm/CvHXkSi5TO6a/3V2Z1ZG5NW7DE3NXfl06Q7jf3j7wlzFUh y0BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424279; x=1770029079; 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=ihgHPvo8f/5WhF8dueYUfBg8T3cvilAtVegxJbIQf0Y=; b=i4PbN60HmCvPxxhjUcbe+DDSWHgFsrVf9zbvhRrZzBR6pBlGih1ZzuRCNKaOhhgJei 9X4JqAeRYBD02OwaJDbTfOYY0GpoO0jSZLIX0hSqh5UEiu6zojrTz1rj9yDUw98iyzis UQbua47pUOI3UdnzgJn5ns6gP3H5XCZmcSoqPQYN4uPpLEj7Dc8Amr+Nq3+XFRtsCuPy pl6VZTwbNkVIEAQCdaecgLQL+u8XD6niRV4fV23lrRmxYBIN+2W8uWtAWT7BVnmL3Cj4 CwKS7/pjWhIeStXyg24lKLAvoL68w5BbR3WMytMnJK/HPehttyPmU5YukASZ2qCCm++7 KvPw== X-Forwarded-Encrypted: i=1; AJvYcCXilbDYZCCernaSP49vER6tbJxc2PsdBbJfVy1/zuJJuOCkmksXGM8XB1iOiY+IlvjVc5QvhGmCNH8T01M=@vger.kernel.org X-Gm-Message-State: AOJu0Yyhg9ZZd4qFN4MK0qB5oCTNCzyx/0WusDiDVpmWZKxkOTV/ifdx QRHW/nKAdhe/vGC3+IlgTSwEC7t6xnmIRXIEjOLvy+nmh6XyYcWTzG3UsXHgOtMI7I5jk6bPU9U yRQOvfNkK5EQXjF9eqpwjOQ== X-Received: from wmaq3.prod.google.com ([2002:a05:600c:6c83:b0:47e:e4a5:c5f3]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:a194:b0:47a:9560:ec28 with SMTP id 5b1f17b1804b1-4805ce4decdmr47124945e9.13.1769424279726; Mon, 26 Jan 2026 02:44:39 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:04 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-16-vdonnefort@google.com> Subject: [PATCH v10 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..081133ec45ff --- /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 + 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..d28eaee10c7c --- /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 + 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 467DC3358C7 for ; Mon, 26 Jan 2026 10:44:42 +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=1769424284; cv=none; b=qm0fuB0Oi5wguOQp7hsZumzPxbK5UqK8hVh4iSJPKiuOO1nvipvg48sChn8tydtnNQVW0FVUeW6u3Hsyxb6IHYzbCdhUjzZVpqCJd/EzxWua0jqOQVuEE9ETVp6aa42CWjIBf1rOWwtCROxWbPvOwPS5+Bcp2cK0u1j0umIMTkc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424284; c=relaxed/simple; bh=EpZK/BzfjQaUyxEz514oZ/jLm3vGGjz0nMsmnHSNIkI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=FFSJBz5jglFS6wVD40ADt0NMcCj3bduZ0Zrvig4FlH5rnLQDfGD93XBy6tkXbSnChq17qP63NGfFYnByuN3uphQY0oA3PrPVC4Bp7p4p/77kjafTxlHdcBrPYp0Jql54oTf7csSOUjuS/bJ3G0WpaEBW6qMXkzeIUOjfl7IeKUE= 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=qxiOrG7p; 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="qxiOrG7p" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-47ee9a53e8fso36770155e9.0 for ; Mon, 26 Jan 2026 02:44:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424280; x=1770029080; 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=zUro18mbSKiw5/VA7IRp/lLCcUE0ruHzOjVvSoVnLbM=; b=qxiOrG7pmM3te3gdYuIrFXZVC9l+HVAlrVLqdD7RY8KfuTWvt9++PATdu++iQ4nGr2 i1joQtz+QewOr1UUoSlavxrmfGxQramxsHvP55oiHhaY4yP94k79e6/8yTX+U41TJvoA Ea1A5YtfQH2++p09TbLU+POHOMwR5Fbq07v0GXpJXixN+zkLEbRiTQnQiR5+qu4xdahn mKb57P9CqPtBsMDUwxBLqa9E2NjRy3/Y3jrhmwPrJPcj3sXfLToSTkT/Gf8nyB9J2Umg XniXL+GLaz+8cIiISWk/kM2fp1Se8sPYqMd3qxMBoYN/iPXEJfv6140cd+BHnXrrok76 ZeOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424280; x=1770029080; 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=zUro18mbSKiw5/VA7IRp/lLCcUE0ruHzOjVvSoVnLbM=; b=UMMNKIQRNvn4IXdilOPFmYrE5aPcS8trEyi1IwkLymwfhe90v4Q1xTkDL8/1Ww1GD4 Cy08HDEvauAwT9cSau3Lrbj1FliA9TJ63+SXu0RrvmjxxrorVPIqOo8rHATDKr4+qi4W 8/xzqyHqhu+OmoqbWA7aCKZRYj0DV4t+n6ogaiFPReFH7fF9OR6udV94YS1+UU/K0kud lvvIWYUcRe0r1P66wZhYOtj8VosaCSUy3perRACFn5SDeEAnMyEhsrFga5x7kt/D5cx0 FKH/7zrS7kA94osDSpPrdWGf+EjQuUTsUqki3/cxgqeeSL95n9QL3MOEEIGd7G8nx5lR V5VQ== X-Forwarded-Encrypted: i=1; AJvYcCXA3H6oKWPALWNqYqEqGVxi3uVQXQ9keBUD5nqZ+5q/ORdIMBmNWgcNd8XZWxKaCpCGX9PtiEN422YlpBc=@vger.kernel.org X-Gm-Message-State: AOJu0Yz93MyuwByDhmKRRtDYLveLgEElwdM7cMDghTgGT+Brik8iAjRe NER8IM5yP0mqwctSPFSan2kTg88ExQf4tBUXpzaIKgCXjDhwCxXhmLZbpcH+0pjoxyACxclT+cu UikOsfNmXKkRMW81y5q0ZzA== X-Received: from wmom18.prod.google.com ([2002:a05:600c:4612:b0:480:4a03:7b80]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:34c7:b0:477:a978:3a7b with SMTP id 5b1f17b1804b1-4805cf5ec2cmr63608005e9.22.1769424280511; Mon, 26 Jan 2026 02:44:40 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:05 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-17-vdonnefort@google.com> Subject: [PATCH v10 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 --- 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..e7fb3ee96c30 --- /dev/null +++ b/Documentation/trace/remotes.rst @@ -0,0 +1,59 @@ +.. 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 +A trace remote relies on ring-buffer remotes to read and control compatible +tracing buffers, written by entity such as firmware or hypervisor. + +Once registered, a tracefs instance will appear for this remote in the Tra= cefs +directory **remotes/**. This remote can be read and controlled using the s= ame +files as regular Tracefs instances such as **trace_pipe**, **tracing_on** = or +**trace**. + +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 + +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`. + +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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 5F64A3346AF for ; Mon, 26 Jan 2026 10:44:43 +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=1769424287; cv=none; b=KGUe0pvqZ4TWWvlCYlL13Dl8LbOLtmILvUNPGE7dyAx9GTEgiH6C7AQ1rPqHgk4Xmu1+lzwe+aDIQB9cWxP3qZQLhcg4W8JSpiGkcBlJVgj5jrP9yq9zUfXXHcWFu3BUZfeDSxKkatZooRFH63SYWzgVtIAOb6zX6fHqpk3ueso= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424287; c=relaxed/simple; bh=xjEuSksDJKSQNNkYquEsLCni1hW+QLCJE9z+GY0XPL8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LuefdJ+AYmQ2sdlalC9zis0RNDhzPqYRVwvRqgN8Z1+M3nuPrjVohhQXcSgzgj2Tl08AaVZFzRCE7f1Z5hJdUeUEsIEvtpe4yn8j8QVsm9/a8nT9cNjtUV8YItmVB/Ou6sxPklEYZIo3yvBxW0dA1P91mRif8zyoaws0/JFXZ+w= 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=vOrYLh53; 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="vOrYLh53" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4801e9e7159so37024205e9.1 for ; Mon, 26 Jan 2026 02:44:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424281; x=1770029081; 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=bAuB0YdbnPC1gHE5GkC16j+FeJhoKW2PjTnj9gON1mU=; b=vOrYLh533lyEZxyckZlCzWqIJvhj0R12H9tiYB3ty0Q/auFPQg4qNwStLkJKOwZXCe 1eNpFcggHDjJsdyAbnYA0l84M5h1ndGdhGQt1J2p42cXr6LOZJrrlk4Q3JdfopsosHVV t7HRPNPisfvN3wul3Fr9bTujnDA+S8lMUpFT1G9qeKSn6lZ7Immh97Nwb6IHZewZ0y2s jzB7S8W+EEFGAw4cODUMcrybouX9r0Xk2LsYwzpVjvDWYW9osven0ClZSGFKNJea/F1B 6/gGflqUjqc+RJ4/EcB5L5Y1YvQU60KIW5LH7S4Ls9HbfZwt5k8elQ0b+pQyAne9lRMI JZjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424281; x=1770029081; 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=bAuB0YdbnPC1gHE5GkC16j+FeJhoKW2PjTnj9gON1mU=; b=qXY83Ht7+1cLacPyGavQs7W8Rhy49XlWtZDQJCvhbtV+nqUrRVLFDP+F5G8T4C69r/ VYPnN6aEsqkTlzJ/Pv794+1+jyERK/P9iHwhf3MGIwsTevxO3jHKorZ4WQ9DUfnRqIkL PeeWGI5WIzQGLP9y8wT7ty2CV4qii3qJkKlNJ3r7TmKryemQoyqmex1CWimvoyefE9md zyYl0DSZs7c7/OFs/sfG9ZQlUJ9sapmefmKO04LJx/ybv4fjiRd0S3kEA3nE7utYGRU3 nIZDdj5N6w6V4oZAZNNxRQYEsRIzwYLpUfe2D2k2GYkh6EZMtYFvnjLO7tIazOKrGI8j pUIw== X-Forwarded-Encrypted: i=1; AJvYcCX5D7erOxWl8Jf72wCvWHzULSEAn+jlqpQPfDaHbC5Qz6hNbLMepPBApv/6Gd+6ySozRPKmcCY1PV/unFI=@vger.kernel.org X-Gm-Message-State: AOJu0YwP/eXKzeWvkQEe8/Mb448G3nIi6+3A2dI9euvDihkY8iXB2dUc fetx9LUuhQGSwbpyU+Mg+lHdokBTiBF7enmpPasuEWPpxF2HQI0Wb16OgJru69bU1tyetehxGpK 4l98oiavvAafEryqAKm8LRA== X-Received: from wmlf26.prod.google.com ([2002:a7b:c8da:0:b0:47e:e722:72e4]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:a05:b0:47e:e952:86ca with SMTP id 5b1f17b1804b1-4805ce3fcfemr73650335e9.2.1769424281349; Mon, 26 Jan 2026 02:44:41 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:06 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-18-vdonnefort@google.com> Subject: [PATCH v10 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 f324df2f875b..ecd0e988c699 100644 --- a/include/linux/simple_ring_buffer.h +++ b/include/linux/simple_ring_buffer.h @@ -110,4 +110,11 @@ 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); =20 +int __simple_ring_buffer_init(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(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 1d1f40c8c6d8..f01386975266 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; @@ -342,10 +342,15 @@ int simple_ring_buffer_reset(struct simple_rb_per_cpu= *cpu_buffer) } EXPORT_SYMBOL_GPL(simple_ring_buffer_reset); =20 -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(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 */ @@ -354,15 +359,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; @@ -372,7 +384,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; @@ -381,6 +399,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; @@ -388,21 +414,48 @@ 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); =20 -void simple_ring_buffer_unload(struct simple_rb_per_cpu *cpu_buffer) +static void *__load_page(unsigned long page) { + return (void *)page; +} + +static void __unload_page(void *page) { } + +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(cpu_buffer, bpages, desc, __load_page, _= _unload_page); +} + +void __simple_ring_buffer_unload(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 +void simple_ring_buffer_unload(struct simple_rb_per_cpu *cpu_buffer) +{ + return __simple_ring_buffer_unload(cpu_buffer, __unload_page); +} + int simple_ring_buffer_enable_tracing(struct simple_rb_per_cpu *cpu_buffer= , bool enable) { if (!simple_rb_loaded(cpu_buffer)) --=20 2.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 6EE3632D452 for ; Mon, 26 Jan 2026 10:44: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=1769424286; cv=none; b=kWolh0V4vp7yZgU/Njrojcidx6Vd0uV134B6CXgMyL8U+Z+vSXV8y63DjLbjoEukhr+mfRlSjQJznYVLsqq66spa3hUlHNckbx01DOtGXuIAx/84bBD33xLFei0Slm/DIOM8wo55nb4/duSn4imxp3//7D9XP4rcnsrm8DzxOtU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424286; c=relaxed/simple; bh=+E83IqF+W5HGdaZV8YeGmeArEiV/GcB4OlenBzDOJBU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Z3WkoIJaSlU1rVPj1ZN70nzA6SDxbuicen7nsFKksU2zxnsBQYeGm+UHf1qdBKbuioJ4TAGblSUpYTu4Tb0esLvDZcdii0k9w2mWJafpcgSaekHXcOI5ztSyQdJXAJwd2vDJSk2kUfN1Qf3nt+ny6PcYtQ+K45Z6ulDcCo1AFcc= 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=wlD6eP8C; 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="wlD6eP8C" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-47ee8808ffbso32712835e9.2 for ; Mon, 26 Jan 2026 02:44:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424282; x=1770029082; 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=YywhJHdQmzvLYqPf/VNWfmyvJv23Am2v8tnakAtmlS0=; b=wlD6eP8Cy5H9w/NYjunLT0egu+r60RIhx8pFPhL8jXDb1hXA9pCj0U4+PtsmEpAcR4 8wCYX0ObA1dwZ8mSORYRDP4FGo7Zs8nJj3Qx9iL7dSrUmb5MVu+ej/2ibkVE9uEebAqB Uf/Zquzkkk2szkm/3AaBvkd3UWczEjJpkoOnWzveLZD8tK0GMfWn/bFtDN35Zbk0i2zE ahefMVgKQVZ1HhSiCF5urT1H1238vley0YRge5PhZIqDZjbotmfZQe7+4N3fdltcLsn4 GFjxj7FH0FqFpz6kKaSNiMFdKEOfx1hruBsnjOMOsqqc87n7iZV+B8TnGofejV+hNuYE PM9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424282; x=1770029082; 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=YywhJHdQmzvLYqPf/VNWfmyvJv23Am2v8tnakAtmlS0=; b=p6K0aA5LulCit5JDO2/0Qa3iYBOdF+5B0r9Q7Acp4wBBseBOmzr9+dY3U/4NLWt+xn 3tY6/PvY6E/bpXgEWdj48yfytZCVDoTKc9wlXKvXpGa+CkeKw3wqT6VkVa5aMACYPstz SLYV5/ASnp/RkQrmrx+LXPFRK91gmyMI9SdCrjkStE7hT22IQAirbrsHf5A3ytxX/1FJ G7sQCHIfoYugdVWQJak8L7rKyk6qQklO7cld1Cz0a27YF6JpfC49u3zkyirwOsVkS8mH 9moE7Ln+o6O70IuHFj/uhUYq997S/LRoz8J3mxa9omSPTenyrLmZk5aZh+IPSFO3rij/ q0IQ== X-Forwarded-Encrypted: i=1; AJvYcCXC9+V+89jg/iB3SF6fmuIdO6e5sm8U/ZaZWdOPdOnpSRqyrdxNzCKWsoojMYYwnonTid7pP1B7AApjsuA=@vger.kernel.org X-Gm-Message-State: AOJu0YxLj9xUf2Do0dv2znKpLu0LpIprFMRrS3zDVNeUPXh9FfxwIVKO 8XRs8bs8lVqQBRln70pGh3Dg1sHk1Xvlt9bVOr4mKj57Ugm/lk5A578FwLvexPSGSN9LcFisC8o odfhNcYMPXmyRS6syvOa5cQ== X-Received: from wmkg7.prod.google.com ([2002:a7b:c4c7:0:b0:477:5a4b:d57f]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:5395:b0:47e:e20e:bb9c with SMTP id 5b1f17b1804b1-4805cd40991mr56788285e9.8.1769424282193; Mon, 26 Jan 2026 02:44:42 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:07 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-19-vdonnefort@google.com> Subject: [PATCH v10 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. Signed-off-by: Vincent Donnefort diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index 9e86c43bf320..9f675d5d27c7 100644 Reviewed-by: Steven Rostedt (Google) --- 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 5662D335BAF for ; Mon, 26 Jan 2026 10:44: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=1769424288; cv=none; b=qojdDb/POU8db9fCaaYGp82MJ81jUv48wA+i1oR+4AxfkvBegab3h9Jazd1nvKHTQxBeCwJm9R6KVSSflug8R4/y/C+FE7NVaT1jlEAZtvLS+OSAJEIufxL+gXR3YQOgYFHefu5ZLeMEuHeScRljn23VtfmwM1Kv/8X+tFskmDw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424288; c=relaxed/simple; bh=oQepgTds953X9ZSRx8narASK/dLpitaUTQSyWeif9Uw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PoV//+zsVAcOQCQR7NVDJiIgkoiqfqCHsK560Qc3swtQ0dod2RdZKPUKR0nwA85YLI0CTf75/T8vJvbUu4fBB+TPXbaOzkibO2Nml9vq0mD83yI/k4FSnfWjEf4NpvjfLVAJIF9sdazSBlgnlaoGZa1eaDzdizxRbTKCjuhbCu4= 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=FGnIJx4U; 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="FGnIJx4U" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-47ee71f0244so35310715e9.0 for ; Mon, 26 Jan 2026 02:44:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424283; x=1770029083; 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=nCWSwRRLX2vVrxRiofVP3mO9oKo652mx1rQXYMhNwUA=; b=FGnIJx4UdBv/Bq8WFht9aEkjQRELYdgbIN3Bhhzmb9RldYi/knvzoihP6hCWP06m/x SUa0gfSXCQ1glnu4eRfdV9iONw3costiwhAQofbEe7ifB1TJ2lUoZ5UqPMO7QOm/oeCn 73wI4L+sRsB8ngEUuyZmvX8MUsAQnK+AJYVS79S7Iaz8wcusmzoLoWZRRwoxYDd8MAMy EYKG/DF0FaV8yWvHbvkWs4bJPkqcXQO7pInFIr7s3yOFmJ7hiAVm9H1EHazujtuC2zIE h1nEtSKqAGEbJakdQfOIPaTpkHitRyYmKUxqh5QHKsi3pEgZsFEKcHfxvH3GJBAXY0Om 8mHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424283; x=1770029083; 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=nCWSwRRLX2vVrxRiofVP3mO9oKo652mx1rQXYMhNwUA=; b=jAhwALnAGxscWpmxVtKz5D307ezdpeOnnuiTcXMJ6GqekJnRPjCrba91VqQQi7kpGo lONVj9eeiNKcNewEl0eRMEQrx7Ai8VLD0tf2/W/6JiWXeHG7IQhZaTJe8OD9NCZ6co7Q GfMyInCve4ja+360CqEXfnotRc7bIkGKRUTu4lCzM1ZeshiTRUQXfHINplsy81JbMhCx 1Dhlj1FHKYWf6cyjrYmR06yt2Ztpi0OLJPpyAolkr4+ikkuwSfjVr3OVy1nQHaZ9Ap0h /juPBanoshgr7Sbo0nrQ4xfDzaW0dsEcycduhT0+di9sg3va4pISX76hDzySzuDWULO2 i8TA== X-Forwarded-Encrypted: i=1; AJvYcCV67hUIP/uBPCpGbqD9t3ZZk+tOAVdHtWDyCzwI4+18gcpcaW5J8LyaZvQCoRcn0rQ7rV9r6xHWxH5Pzcc=@vger.kernel.org X-Gm-Message-State: AOJu0YyrTE0aqsNN+iQcBqQfjkPkJlMOjicNvgdyS8IcxlGqzOH8CQV/ 9yVNDSHBGAgB2RbuUyvkuLQW10P1ATEWjIB2dphIKN6nG1mImf6AJ4ZuLe6kwhfKGpsa6npN2q/ pGCBLWtkXbD1KDIjPxjBO9w== X-Received: from wmbjn6.prod.google.com ([2002:a05:600c:6b06:b0:479:36b0:ff54]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:8b55:b0:477:a1a2:d829 with SMTP id 5b1f17b1804b1-4805ce3fc93mr55832515e9.13.1769424283227; Mon, 26 Jan 2026 02:44:43 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:08 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-20-vdonnefort@google.com> Subject: [PATCH v10 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. Cc: Kalesh Singh Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index 4f803fd1c99a..6498dec00fe9 100644 Reviewed-by: Kalesh Singh --- 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 1CFD3337692 for ; Mon, 26 Jan 2026 10:44:46 +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=1769424288; cv=none; b=ecPnHN6QJMYcyNhSTXUFJZHmADthUFy6rvMX9tNgsltZqyyQvva5Hv8m7dmsGUiYHRuMWTVCwI45OR5SN/vdcjvlWlwIfxePyZtUELVEn0I1mdpMfBdU9GN7CERPMZBbpryoUbIwIJ8D75DLFyAlGtGfSRlotBVmPu2pcKNixM4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424288; c=relaxed/simple; bh=nnTr5HL8Y/dQvuipzEumtvYWxP+I8ZzG7VGe+d+aJtA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=sTvcx1ZkUsm7wUtTTgwTFYKQHlGYAuQVGGIHyLJt7Y6qhV3pVIV60Gt6XwBP+dxkvz6Kdxv6uu+ew3hbexIp9YDAErO4lC/OFKH/eUvtu2zTZTjH35ItEGUUusdfNJ7vizxUUYO1/O+WMRzdoMSAIXuCfs9Beeg5bd+5qQrW/aw= 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=o4u26+Iv; 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="o4u26+Iv" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-47ee868f5adso45987455e9.0 for ; Mon, 26 Jan 2026 02:44:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424284; x=1770029084; 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=+meh5z0/4QwnO6LSl7j279PrriMLEbu2DSgtDyqQa7E=; b=o4u26+IvJYimne5MRWzBeW1wCPWjgeHLviOCq4bVz0Wc2chZqWOmc0eJHzcTedZ5Jp BrHVvOQ+q4qlxPusKoj+eurUBbLE4h3lWOGl0HeCRTIrWeXwRYt3rUZCF0ZXMC38pO76 P0pP+GBWTKIB/uPI3am8oBNj942OV/rax52jDYObNmcMfLUvxbwQea2kJfJrN+JhPNke 4UkcFZk+06IbU+jvQZHZJBd28LBA5lnd0BC8a5b5Scopz2tKq8HbNU3J7idbyzDwrSE/ xX8ZZW8A7Dl3C7hGs4dV8v4HU/g8069Xhw2ux1QVOmIP80EgLyLNS4ruo3gPBuY9dLiM zz/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424284; x=1770029084; 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=+meh5z0/4QwnO6LSl7j279PrriMLEbu2DSgtDyqQa7E=; b=B6WdhUP/LOQottrepjpwDht16iogblddDu6H3kNQ8XLx7NhGcsVSHoO2eUzAEgzrYX Xv9cXkqh9bdlDcpzWtTOsehV5iDSfOSuYWO6VVOr6cq1ZxsZD9+QC78qsZkJ12qZsp7u 7reg2jYA+FDfzSSQbusbABxQZVRQxzpeaeYrfX/YfxI872uDmCjCqOrdO9IWlZ7NORlc cTnEwKr9U+IRTAB26bVwRHBIId58qeYJbYidelkPsbnpokPAFxh7QcysG+X6yD7KzJBy 8/PEtJaiTXSx5l+lFpfTNRfBhe4L40tgw0LDMJ3V3NnOXqWf8kpodN/fuEr0xHKBuF9/ 0yzw== X-Forwarded-Encrypted: i=1; AJvYcCVMLfYepUQ1kIBIPy53bLuGvUXku2j/b7wzPVay+r1Ch9BOQlsKOeoR+4fwzORC6uJAETHIRkg1q0gscf4=@vger.kernel.org X-Gm-Message-State: AOJu0YyEPyO2PgeL8ANwkh2vmpNdNrJDilXOfwwqioKdSqYIYcc/pbZL Qd3XpdVe9LZIBLoCaj9y6VlfAW2+FcAiKZURUaiXyrbM3W9SnIPyqgFWnr6zNFBHtRqnowELY5L FlD+Q7zckcbhv+8WNVAX0yQ== X-Received: from wrbei6.prod.google.com ([2002:a05:6000:4186:b0:435:c02a:cdd4]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:5f44:0:b0:432:85eb:a3cc with SMTP id ffacd0b85a97d-435ca145617mr7262377f8f.19.1769424284248; Mon, 26 Jan 2026 02:44:44 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:09 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-21-vdonnefort@google.com> Subject: [PATCH v10 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 dependant 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 54D85337699 for ; Mon, 26 Jan 2026 10:44:47 +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=1769424290; cv=none; b=DMXUT+mswQ+NP0jGRm3PmTlgPFSKGaJAdPr2IXzfc6xgfSQ+PfkiVori+GWBvHkPt8RAJgslUb7/2Zklc73k/ps6xJWm2Dzj56kmHz4UOYqh/ujLqT6Si2/OZG4eaj78yUU3U0dLh9ajFpx+lg4mYSompefChQOyfj50iOq37fQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424290; c=relaxed/simple; bh=Z1j4o4+waP9P8BMzvXX9NWQ9gWTJqythBM4p1cmuz8k=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=SKBYCM6jpZ4tmVjITr8t13SpdHLPnYERkTcpVefoNe0auwb1Tz7lKSypqkTFlNQEh0xUlUwevZzFfPxFt8wPi2sx/WmBnBkBYwCkOiNiHG2xFdA/e6AALj9tzYHCi2FkzqHYLWF+drTXxHeI09fdOv8aHMW9X7m8B87ibajVaB4= 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=AGgQhA/i; 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="AGgQhA/i" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-4358f1c082eso3118560f8f.1 for ; Mon, 26 Jan 2026 02:44:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424285; x=1770029085; 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=alMoUf2aUYBx210TxkyVF25XJBvAOIVS4skWHmMgVOg=; b=AGgQhA/i0lFF+E5lJ+OW2LHQ6Bj80hlRIDemOdRIazHuS7AUMufEdLGhhSh1ayvLlg VJ7jp2fTnhYuSwL9Z4fuP7TC4NruDkTZZAiBsOnssPAlYlkRN2y8E9ivFRFG1onDlslW 9GeUiF3aSBvKgILRf11ynG+mH8pCGGIkbArZGO9SpaCuWfKqDobXct189MDKqpqT9qso iXR9bZ8SQbk4FsSTPMlb2jCBW7jMo3mH+bwls71PulIzYVcy7IujwSJuCg2bN+fWGb7a zihWE0YXGEE/wcEW/BXAu8N8ZmncciU4rU0Mlpzyy1XUNL6Ymv6CwDSFbTdtAFwHx4O3 /GoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424285; x=1770029085; 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=alMoUf2aUYBx210TxkyVF25XJBvAOIVS4skWHmMgVOg=; b=T3gxVR9j3Qe3Zjs0MA80CGihRN7IRW2Jkd9+eiqb8WzymqXCSLnsn0FTJusaB4/jA9 p7TpsRfZwLHK7D9wXd84s6aw5qA+lY8/6hDGNND1cAHyZx6yFLiH8M65yfqnbSMu2Mn5 j4xGREo7pEcI/TCK5gLl7U0CtxRAJvzdc7BeFWCuU7yqXSP9n6UrlqkfvIQYH1fC4ONN 30z/5tdqSGFVaY6KPNvk/dnfk7/MVak+pKSOvtRd+oTAVD3GoZOE3LSbblnqqe24X5NN FoJ9zcm3C5+PhK/B1sEMAeJXLTOH04hTSCKynvh3Ep+x/T0xpDvI5P0LfSYS0JC3Fzxx aB4A== X-Forwarded-Encrypted: i=1; AJvYcCUH/zZ0m0gDUGsAbyUj7jr6KoRjBShXGYq1/h8TmjzsusMyenIlq5X+Y/5vOxl2XRn313jGlqRz8gxc3qI=@vger.kernel.org X-Gm-Message-State: AOJu0Yyf4o3FbIuZ7k9H+iu76sKOBK3Zv+czUnbTV1DoaMxHeBI4YB/D IHiYRvJxwkQXEgj7SA+SZpr09Dh80UMQ1ztp4numJnKNSTOaTl311vAMwPupqmxEeOt7/bVKNOz Rn5Q5/zh/LktA32v+2geGrg== X-Received: from wrbgx14.prod.google.com ([2002:a05:6000:470e:b0:432:c17a:bedb]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:2508:b0:435:932e:f932 with SMTP id ffacd0b85a97d-435c9a9bce1mr6750834f8f.7.1769424285177; Mon, 26 Jan 2026 02:44:45 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:10 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-22-vdonnefort@google.com> Subject: [PATCH v10 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 78A523382CB for ; Mon, 26 Jan 2026 10:44:47 +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=1769424290; cv=none; b=rl6TBWZr9WdPZxkdkyDnXbDjKZefoen1Hk/wQiMSXLRkVmHMNrznK35gFlW0KasW9zX42xh2bcdFbInTxf6F/mkikOiT5DKsHiLhf1vkfSBZwHWJJtytywJDLBsxo+D8dCf/BJ0eleF9HPXwlhJV3Sg2czsha1fir/7JZs6690U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424290; c=relaxed/simple; bh=oo4/5f4YHfSVUMNCfUHjyArRgPM9xVrZtPhrVV+hXu4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hvAnEmbwbLTtwEQZb5MqVQEnkXp0WijAeqyc1dGVKBIKpdkrQKI+ACg06qv5Vizuf1VAtO9Xvbhm3CrK9oky447eXpE4wwtYvVMWsm28qRHhs5SdM0ltglddS2rsDbsUpmctq0HCqbPPNssdlQ97KKjnH+3fuTeJOazLGruyE3o= 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=cjtvoSJ/; 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="cjtvoSJ/" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-47edc79ff28so27462545e9.2 for ; Mon, 26 Jan 2026 02:44:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424286; x=1770029086; 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=JHa7j/CKtQd71sr9sGVN3KtiKJalnxGKPFOliEGiPCE=; b=cjtvoSJ/nFEwArZRawlnObOcK92nt7gfofnieIgV0/wAGwXTAeZXCy2JwBO+0IDYGO ag3vsaIiuE4Jt0QjDErbGdcOg9wJMHUnYnA5LM1MwUeN/l/F3M1OsNU8abaNBsUpwTrs 6iUFrLgHJ8QaxbNbiLXrDBb0EVbtvyK/+3q2ucpMLysYjF2ihFGzbPe8HX0n6+6ed5f0 DmwVgIoDDTb/iWmgXXcqIDLnQ2tvJPM7YZGVgag5mYex6yxKG0n/YoUwlB/BLDgen58o AfIuxA/mx38YKLD+X5Q5z75CiNKiCEMIjfGMxe5ZUhq4QSS8Q6pzBooiP0nhase1D6aD WXLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424286; x=1770029086; 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=JHa7j/CKtQd71sr9sGVN3KtiKJalnxGKPFOliEGiPCE=; b=nk1GsNsl0CeYn8CEVT7DE5xGY4cfSn93Lvz+v9MhwmrqTuALon9iIB78Sf8YhZib+g TfmpFaRYMM/Kdh1cmNzHDrXwk5z9f7YGlhehfEhqKK73dRhLKBJrt2/MAi623qjM5TzT UBsFAJynf2IfRtOzSt0dFe6bz1VoPDEQOohY4UphKtsEVZ1/MhfzuJ+LFjbcyTj80O9a aX8P0+RTUQSigMa305PAREzTEhySSu1GtZRdk7lYIetg/leMd0vjunnOEOBjEQrumoh+ 36iORF3fvXyMKjzXNZVPyHorG7urQ6ZOFz0B4Ydn12WjpMLVPbmTYv9pGL8dmGe66EwM 9CPw== X-Forwarded-Encrypted: i=1; AJvYcCVcATqv3BugyEptzDhvkbXJy1CSM4PQ2pB+5y2Ea8sFlVtqBHyLMDPozt87tWpW7KMWw+pdrQy6flVIZmQ=@vger.kernel.org X-Gm-Message-State: AOJu0Ywy9/T/4SjJWl+mdlOCTKcyRDg/7XC9Y57BuGQ/qs2MvfirhbGW afwyypFjlFusw4PZXbuRvaOcqZe/45OrqwfDh0jedYxrWiIo1pPaPl7ufyl32kgiFJZzDjM+PZe 3Nt9bONRZsW705EbMr+L6hw== X-Received: from wmpx5.prod.google.com ([2002:a05:600c:1885:b0:480:4a03:7b7f]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:8a1a:20b0:480:4a4f:c36f with SMTP id 5b1f17b1804b1-4805e6f7fddmr42640155e9.21.1769424286085; Mon, 26 Jan 2026 02:44:46 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:11 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-23-vdonnefort@google.com> Subject: [PATCH v10 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 EE7333385B5 for ; Mon, 26 Jan 2026 10:44:48 +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=1769424291; cv=none; b=JyKRXOyz29r3UHChJJHo5RTUPbBqxRRAlFjsQ7A5yzihCBTOmw2hPXBazW0oEFTJtNxhtuXer+vEEEcatdiJ3RDh6LV9Y3qpgleZepEfib/Ko3ciT5vFgMg5EI1xGgiu/laz4JHgZB2T3ipl3u20rKWbC6iaFUpIYs6Zgv5DJag= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424291; c=relaxed/simple; bh=ypMFfHfalMIyQYquAj3sFqakMX91FWsODppbj4WuI3Q=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=u78X2XaMgOPz7xjBsLfTDBVv8rP1zwIFJr5At5t7XirE1ihXtunSeZVWsmEQv7IaRTX7340aVsq7/qSFIeuKRwPsUJlxAtwtHQzfCR1ZiKh24Jq09qL9zDBkLcWD72FJHWyFEKSNzvBDC+t6LVVjT2zq/0Pf4HaN8BF+NO7ZP5A= 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=gmPRL1yX; 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="gmPRL1yX" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-4358f90fe8dso2633254f8f.0 for ; Mon, 26 Jan 2026 02:44:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424287; x=1770029087; 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=xCBvM23KkkEsjCnThoPDgRZIy6tQG6NfdCCNqUUdC2E=; b=gmPRL1yX88SwSGZlJT17mGeDXA4iEPdPsJ68h2Eecu1wq+nWgif1TWdWINUjryQm5T wWB9sVKmattTT645Q6Jj79o8xxTAF0yd5mYverqWhBeDXjvnbqmgj9aGeougbc0yhDrk Pbq6a8kQtsp6NVLVN4b+mnqS6simjN4QWj63cjZXsH2MqYfohjY+YfoItn+FQK0wDgpL zvOs+iMNnpAoLKzQFzgQcDBHOsmBILKb3404o4vWCGFznmXdheyWvxJUHUrwPl/xfCoc ocSESy6uPoV3Yzy/1YNZyuPKqAiQCT512I3MLwAexDOu+FwC15ptspzQ7ALQG8hKUa4X JTIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424287; x=1770029087; 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=xCBvM23KkkEsjCnThoPDgRZIy6tQG6NfdCCNqUUdC2E=; b=aXVZ7YK3fhAzFCdakN/mWZ9vtKL4SmF3/pzm6pQz745ruqwqMc+wD/McDGUQGpZlyB DZNG9C+tVMG+1ABbs13q0ZhNeTgH+k98J//LSopRix/z6/3f3jUkf0nqkyase8rQd1L4 DPsjjdXD2D6CARVMdmfbDWhd2tyK5chreDs3gYi1kXpotdIdrnKZngfhageELExtYeWS LXo4GHuXOvrRd/z2LzuQl2I/F6Odr7YUknbgxjH69VZcepijDcWz5Dn31asuYJSvMULr AW4QMQVvNBKmnC+zd5pCBEJcIhYg/ciBdbzCmoVSbqGvqCVQpd+jQ8UHkHsUqEda8lwF 5gCQ== X-Forwarded-Encrypted: i=1; AJvYcCXaQUazzakJf5ewWFjS52AQM44iEhRRIu2AUyuQhLNgzZ03M7zcygijEnRgrG2f47aAGi7gci9wUmc6IiM=@vger.kernel.org X-Gm-Message-State: AOJu0YzRikZ23G5BmKCnq0sSZPrKwg8KcCM/98GOJnizFVdAgfmkBUkC 57FNyfpGiRKgXps4kh/bwQa26gmYAFO/tIbXCc9hEWCHUaM0PymI8hrBbj5lz4gs5gEn++/Vm7Y ZtCIXUcIGLq1zbXiiBdpK1g== X-Received: from wrp8.prod.google.com ([2002:a05:6000:41e8:b0:435:a21c:601d]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:1449:b0:435:9336:21f3 with SMTP id ffacd0b85a97d-435c9a9c00emr6591007f8f.10.1769424286926; Mon, 26 Jan 2026 02:44:46 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:12 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-24-vdonnefort@google.com> Subject: [PATCH v10 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..df9d66fcb3c9 --- /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(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(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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 A6AB7338F24 for ; Mon, 26 Jan 2026 10:44:49 +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=1769424292; cv=none; b=DPAvaghFAAPS16lzGZnR+AI+/5SwfGU6EiOC5W9aMSvTHxP29DtvfBaDsjZUOe0i95bxNSPximFFpmri31lSkOSetdqU2GXmCfn8wJ10hZijHltCnBPhtFCquf6rf6lOlTdvka5PB/ycwCm6EqoKll8DgPDbEb1I14QHGIH8y70= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424292; c=relaxed/simple; bh=4J5r3BkLqB4HK3gKfcYhAJzP0W+IrKUfw41aLaY1kYk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LwoadpFOplU5Wk8EVenbdlBDWtY/tLLEc5zzqMflEnQ3Z3k5DCwN/vTocoatTK9Zt0PAvaCiMcRIfpnOOYKSVoCzk4FFNU4ZdWB3Sb4cnutCOEA21sryYoEOlqfIzQ3B6jRLmroVUM2wNkiJXYj/rJs3uzDQtLZCVWUTLdiLF0Q= 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=oe1lRjDq; 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="oe1lRjDq" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-480600391e2so7885595e9.0 for ; Mon, 26 Jan 2026 02:44:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424288; x=1770029088; 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=Al13JaelPda1kGCRstUr7fjERPDoFgto1bxv0RZMN4A=; b=oe1lRjDqw0MyEBbM8+lgAqOJN9CqWVB7Mo0x8nanQG58TvSn0okNELsVvu8nWNJ8cp op6nn/7gSHDxaB8Q6928fE7QIty70vfsnpAqB7hOzdIqF9PSD4RI2+OFQq00vyPiTXBY BkwOOMTfy30lLiJaEGZxle2LH6G2RgZWOLfA4eLBp38nUtSRXvrT6vAaeqdLHYHXiOy5 Hv7psPbVWrAzLPkN6R2ml2I+p8Qai5c4ev1R/oHUV8a9KZ0LjRZKYKZXRf+Gfik3xBfY APHMKOdU6rclf7XZY3OKdz71RprSvM62kd1gcmIQcABCLk2zwIRh1iBD53kAck9YmJdO HDvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424288; x=1770029088; 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=Al13JaelPda1kGCRstUr7fjERPDoFgto1bxv0RZMN4A=; b=sEwIJUldzzIsuNUnLcBBrWxHgmNNpRNfh0rO/C3jelVoYLH2ck/rtZ0QTj5KYi2pcp jTLI6efIoPEhXs83A9pYgzfzcdpmO5HLrNb9z6er+GViUGDx35bcser1LWvuzAkgO55y m/mQNSAAsg2WMzLCC6/tvs1+Y16H9SJ9nyRnJxR9lXBd/WPmH9+1Qbp2kVmrcj+Bq0ff JyeC6UO5JmTqWDtNlBQAt3LdyS8gJMeCUEKOXrjWRpIF6Gv8s8NCzf7uKXFEJP3gbiL5 3KSljW4JZ4Huor6jpMCFsUkSdceV3SmIRe4IPIKjOZwxPWyE3F9xHRKY+jJTjGyyV2W8 WZuA== X-Forwarded-Encrypted: i=1; AJvYcCU5Yy/feKI07zX6WMv8oGQ3aNxMmFObooDnXiZ1fdeBVtJbF7EyBvrgSyIOEo+9sMPDVhjX7VtJNxuAlCo=@vger.kernel.org X-Gm-Message-State: AOJu0YyZ3k5T0GViNcl7enHkyvjiXmcw3wC39lZIrP98kVPslW40BnC0 0Ur/nXq4gffPrM5kuVvq85zzAUB7OGEYHAGiMo2VP1aWN/Jto95el5W14LOfD6mIXXPTzMYea3H Uk/DZ1XMxxPvKX6pZTHNI6g== X-Received: from wmgg15.prod.google.com ([2002:a05:600d:f:b0:47e:db37:5b6b]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:8b6b:b0:480:1c53:208b with SMTP id 5b1f17b1804b1-4805d07366fmr68436035e9.36.1769424288058; Mon, 26 Jan 2026 02:44:48 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:13 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-25-vdonnefort@google.com> Subject: [PATCH v10 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 64EA833984E for ; Mon, 26 Jan 2026 10:44:50 +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=1769424294; cv=none; b=cW11jt/nwd+JcZ8OGLPBasJCQ93pjEpx6fFar0PUtjBDjSLwCIwMspbh6cJ6YdMR77L88tARM0JWAmxT2fNb3zUAnrmTM3kqqVise4eRiJtZDuy7tWbRmdEfTTfMkUBeE79jTxnROiybhOs1oAOguU/XurGOOt1HkeBVvkRmzkk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424294; c=relaxed/simple; bh=IEHoas6fg4+rHvu4ApD3tBhREacTshdHwr1AnsNE2hI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=H94ldD+fiaqE9NsUOOBW07nYu5yyoWVBcrEj/ObkBK7oIS/tRaxt5Lq0qoXJ1z0yLilQNhbTe7P8fjQTVpdKCY2lJ0TPV/x0g9gVX2QZShRAVX/0SZAc/oJLimwQUlvE0KuoUI+HcYfg4GPbq/JPN6RqaPsoSTTiLyni1YzncQM= 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=2oH1wDGv; 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="2oH1wDGv" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-47ee3dd7fc8so47164765e9.3 for ; Mon, 26 Jan 2026 02:44:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424289; x=1770029089; 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=GrrY1Bo4caR7Yg7iMIVZCactU50F+u23O+ceOpCGr/k=; b=2oH1wDGvBiQkMzqeMSneLzZmyw5y3LIn3Uail1OOrhSrbsZzH/DnPPqUraKgvPI/Cg U/IvLfVLwOOGQWbAF2UsBO1f2ccLKiA/zL8fgMflVWbuB27Xer58VygDuzfZGLZlX+uk 7bRtBVo+RPF2bVL3o5uN5qAZ1zcDriiFAUfrxzgGOO8tWlxYT2+q7u3zEskuwthBV4XA XT9BZoCl44V+udi7nzO3zOMOQB69Bhi4OqiCvn0DIEg5vWezZylbZ66SvQboI/o3tUpH xvxuCND6qABzRfvgvXXQDdngSyMUZmydcbYvMv4a9k+qa26F4oTr9bIDp+VZDQyoavy5 1+iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424289; x=1770029089; 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=GrrY1Bo4caR7Yg7iMIVZCactU50F+u23O+ceOpCGr/k=; b=fDiCLnG93ujhKd7acKaUNyOpI9BZl983x6WCAbN4RLoqH4pLYDzymyAcoHCrN+yIK9 1NAHJwJynejmctlHok7bEZYuQdIx7lZraVD9XBa5LABY/8VNdWxASg/gsmtf1CNG28ox bsyg6Y5tMXsFtMQFgkteJXytjdEDQPvSem1VapTaHYYsEQF3jPXmO40SeqM9UWSvc8l4 H4hWPObI2n2oWbzQ/v+CyQ7dY94OPyIrLqXbFkkT4TLFqoaVZVnvzl6c66T9DaVGprJO EeXiHziRoRBrf71AtDjTNtKDkvIfDKLpo5Bzsr35joktiObZ97Qi7f72ibJ7YGrCRIAG +O+g== X-Forwarded-Encrypted: i=1; AJvYcCUDrUXBKLkBdaUedkGKEYmyoAwKHRZakrLZeio3WQJ8tUVY71I/6shrNw2fasTgfpRKW6PTTu8imOVSFb8=@vger.kernel.org X-Gm-Message-State: AOJu0YyE1v3xC/iBWkhhTxzl6/+b4k5aDKKjguFKIycQp/18kmcRRn7O HnN7HCSAOre8oL8WwzSh9lH5fkUy18ZieSFyVVLzjjoblq8Zb89jX89VNIzaaGqQvDPGaViiBK8 gUj5nEq2JmFEsxcI+PoZF/g== X-Received: from wmbjj24.prod.google.com ([2002:a05:600c:6a18:b0:480:4a03:7b79]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:b95:b0:477:55ce:f3c2 with SMTP id 5b1f17b1804b1-4805ce3faf5mr68562295e9.14.1769424288788; Mon, 26 Jan 2026 02:44:48 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:14 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-26-vdonnefort@google.com> Subject: [PATCH v10 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 df9d66fcb3c9..97e9f6c1a52c 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 52993339B39 for ; Mon, 26 Jan 2026 10:44:51 +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=1769424293; cv=none; b=ZlYbuQIs/kjhIxfT2CzGyAPvzOjC1kb/UorUr6Qygrhdq1nIBWHFrow93SjkvBm9RLTwS3eqBkq33a/w1exnD8j2+51QfcYLmco1UEPZHgDh+wEMxk3u5logcJtVwMeZtscrJ4wGQJkoJgAdcJWCeg3+NDhvUTvBWpG/rD/LIEE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424293; c=relaxed/simple; bh=QFKjh1R2iw3S0W0hXtvPh8PHuYOY6kFyXpOghIsh/CI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=FrldILXsLxSAkkjYuPKfLVPFZgNP/Mm7OZMQnIEvrRgOt3gxp+HMSjtapkq7w6p0pjweCq/r/d9vKYSQlpPAwzSOWnU5DMNatPD4iJCPvr0aEHnR19UGjFBBeLXl7TGMKwGv5DjwFDqNCiYQB5eceD8wiJsoGKPhLfB3yTN6/88= 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=onbCchpj; 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="onbCchpj" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4779ecc3cc8so37771245e9.3 for ; Mon, 26 Jan 2026 02:44:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424289; x=1770029089; 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=D5VGkgm1sA7YTajg4sL82LxwMLKcPOrXuXxlizx/7Ps=; b=onbCchpj9XEalpr4YfdCyFYVn3tJRUBdP2rQuidw9NXPlT96edzyswXRrnnDTCfGcv wbUnkEaD5rjHGlXppielEvK+65LhdyZN9aTiD7/KxfVOdcau+7/850Dv3k5mcZtAcfXU Xena0E2plufG3zl68jiUggOee7DI2YFhh2kAFx2DRXr5zMn7XH2nUfxZHMIEp64j2lkw OUNvwKSLfxS4b1BMZBsu9KvwmYDX3HBstnyFr4OfBvFAzWFXLD/VUJ3dkVRWGzmj4xKH y8S8EqTP5CZBNuTNpVF7qa2Wxa9sZIJ1SEPBXdLdfWgT9tvnEUJwqhuSTvdDfIutvPBK D1nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424289; x=1770029089; 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=D5VGkgm1sA7YTajg4sL82LxwMLKcPOrXuXxlizx/7Ps=; b=m05delLm55H0w0ig8WrO+kPF96Xi/+/k91t5K9YMAlAvHTb5JSG0JoeiSFCF+9S4s+ edpST4qgZntaVt8q6I4ysZ/04ce/5aVxnYfe/t5eZzBxAct0tvBhZB8X1hmEwAD2uDsT Myl/o7CWQxczPnz8is0NNM04FRq/2Ae+LdGk5xscBpsIUB1kVag8GpJfFPo4NZyXiBOa 82GXBZFRjCUK+PQrKul4vBs/7tUSptXcdK4es6wO5Of7hW7X5zcwrZBTgzTzq5yPflvB N3keq3F+2m6ghXQP1KF8ySfGclY1ZLRdKd4yyBxo8un4/fmvvUisXBLN+mEUohj+qMjf Iy0w== X-Forwarded-Encrypted: i=1; AJvYcCVbho9IqDiwoJ4afgUxBLVX4qFlOSaF9m1EiJrFZjfYks3fPBx/S8LDjDRt9o3h6i4HI0036m9kXAJtldQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyqCXBBCEWO8Z/SXw7bTnWi/9aeKvfb0uZPbLmx4R9NmYbThWtM MUB9BRaibSHfOzggz2Uv+6AVQbDTflVgq8tqqLV3F2gf5rgirpyCEMnztnT5GO0u/sSWa5+gQLO G+skynh6DAhip2ZQA/QXX3Q== X-Received: from wmfr9.prod.google.com ([2002:a05:600c:1589:b0:47e:db03:6850]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4f8e:b0:477:b642:9dc1 with SMTP id 5b1f17b1804b1-4805cf669d1mr57613505e9.20.1769424289565; Mon, 26 Jan 2026 02:44:49 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:15 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-27-vdonnefort@google.com> Subject: [PATCH v10 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 97e9f6c1a52c..93475cc36640 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 0E1F033A033 for ; Mon, 26 Jan 2026 10:44:52 +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=1769424295; cv=none; b=BfaeoKQui2ZR+yTrgo0oT++TXBmNmFnR62WMHCSblK3Dw+pIK096t/Yv5EDFVzTC8LKtaB7BIft9t7MnXSzao8bSdcpkdXAF/1eYHaDP4S71MSnbTdPLfP5vhqwHZXNY+gsk4DtvFNj2s/engVho6o/m6qklajTiEETphVsBaFY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424295; c=relaxed/simple; bh=VnB8fxGO2gUFVUgzds0B3P2fHVZ97K541Iw2lZuD8l4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LbH4Q36oCCpE3GVVGlDfyx+3UA+ZCYn7W/2UlSaBYpf099U0d9TjRhWXhfUDGa2yAmieJROC8oSy9ysxucEv0wZ+i8aFyDlRiAbnhzwHUKal3uAWLEg54FWKRNTNiOBK+Q0llc8Fa7o0Z2WlYl0vOEkqEdqRJ1N8cTjJ5dg+tfk= 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=y2LRMOHo; 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="y2LRMOHo" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-48057c39931so18600735e9.0 for ; Mon, 26 Jan 2026 02:44:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424290; x=1770029090; 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=OlignNV12uletJSwi5vDAsg8J034+RQUbGLlWmQFzcM=; b=y2LRMOHoYC12ThXrai19Tjt5+Rr68K6dfEQwnQ9QU5GM/RxdDqZMHendWsDGNwWIaU pN+tgMnTxIWZa4vB8KmmAg0AP4tqiNeD/3qgP3ZGAxqJrD3hQ/1KNqVl4MXi3MhXO0cM 6yjarpRpd87VN2mgLE6OWqGiU6tqJzxwqck/kYXk6ADWB9oVLW4JafOYuwRMiTFHLOrb OLVakDQ9bdbUELas4XQLD3ibwan6tNBtdpIgGTziNAETzeW4BLPNfO+v2dEhOXRSH1R9 lg805PexLVzXtseVtH04WfWBiC7evCLkDhXnvQg7+HM6/WithMpmRZxHyxwdIaG2e0q+ r76A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424290; x=1770029090; 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=OlignNV12uletJSwi5vDAsg8J034+RQUbGLlWmQFzcM=; b=iEIXy2DXA8c4tSYlyyp2qS9hWVQWJ3wfjHW3LHSh29g87wL+cSC9RoGVuHgWB8iZKd sb1uKNN28x8bL27XgC2cgF3g26elr2JK4BpLfwmAFDjV9I8kZOqsvfKnKf12RPmNkm7M lTtLL/8nwb4bw5p2dqzIOCIYqdGS2PghVGVvWL0helZv6Yb5DQNSwnpTpnOOwnTbBJKl iJN3A1GLbVH5A1K09KUsLWMphblUGjHA1jCgxj7GZV6r41dlrVwsP+ug2WOX/sbZE/va p4LabERJ4+hUmKo/VyE8/ypkvXqpSOLDZ2JwsGqr3AyT1iwVXrshmlrN5b0amR0mHJaI 2dRQ== X-Forwarded-Encrypted: i=1; AJvYcCVolpmmi/145kpHpnUHRgfCT44NYfl4kn3KuuXXo1NT7cPoiyGtUSOHbKFj7oV9YvJhzGDJ1qWkNTB4XGc=@vger.kernel.org X-Gm-Message-State: AOJu0YxlTeP6hqMw+19W3YynqNji2AF3CItLWY1OVwk4nR3TLz7SQ5Mv 04yJCcZvgPnUseWJ1X5rxEAYG6kSzIE+IbKP3p66u3yjvstumQtmumSnGjMVp7Plm+VhsDNQXXb K3Dp6hkwtF0/4nDlb/fzesQ== X-Received: from wmd6.prod.google.com ([2002:a05:600c:6046:b0:479:2d82:5535]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:64cf:b0:47e:e946:3a72 with SMTP id 5b1f17b1804b1-4805d0645efmr62240285e9.27.1769424290383; Mon, 26 Jan 2026 02:44:50 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:16 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-28-vdonnefort@google.com> Subject: [PATCH v10 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 3AC8933A70C for ; Mon, 26 Jan 2026 10:44:53 +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=1769424296; cv=none; b=NkrLpC59v0dl5pXP7JdGXDsiMS0o/7KsRsBwCVPQyJSDatOkMmmXzw3YOqqXj46QEu3hI4DcyRwE0hEnyCYEy8+kz+Dcuow/oW2eaOVJY8oj6DcGw7hiddAiiwIRMORT7C9xNrm36PvsUsE1s6ShMLy+Rys2Z7BMItC+aPxqtV4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424296; c=relaxed/simple; bh=7oIHjiRWSpO5dYLZvgTWL1y/DvoO6BqELjVBzAhC1Ng=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fA7KTCEeNuFJvHpXiQnxjEQlQpPsf0I05YAzu5QYc+G47lZ41ujf2F0HjpyS5wV0xsadHtXjgS/xm7qLsaDkpq2J4ZD+yiY9CMZGgLJilPzwYpr8ZSyDA/hLjP927oJCVaKa94UWoUfqfykaz57VIPpIGdpPpJ3GGITRQjR87JY= 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=RTJK2lGp; 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="RTJK2lGp" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-431054c09e3so2856630f8f.0 for ; Mon, 26 Jan 2026 02:44:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424291; x=1770029091; 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=AEqvB1DEPUQRm82b56L0jom52EEhc5ZBQ2L02Xcueqo=; b=RTJK2lGpK9ulAW8zJTm11HB8Rp+b3zZP/A97g3uzWIgTjcg8UHsw7sROZJz5lY+YQ5 sdQgpBYE9qqxhHkNjU1611d6dxcGkpb/SMQgjQF84KChCTOo2QR9I7tZo47C8hDJwvNx Vu6Rm4UnM1Sct7hX4CKn6K4uUiPeWMaUro+rHIfZ/XaurIXzY1+zdHmbjsfxPgZ8RAaD wrjT+YWGTea3lYuWn+HGUkOgY+N9Oye4KMgB74zQ/dunCYm0kXtS/+smlVVjtJlnwUi6 76GBYY1xzvImXYL5b9+qBJ23hVHsnHHxtCL9NtL1nwxmmlYO5cjjQ7sItF7Rn4BibTe8 vM4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424291; x=1770029091; 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=AEqvB1DEPUQRm82b56L0jom52EEhc5ZBQ2L02Xcueqo=; b=pzum3i2Fd9hcNN4r5QNmBodcOwBHl5jKiaeb57Z9XVF2P6yXZzmBjMZnVAXl9Th472 d8SRj6NmiGAe0MK0g5bltn2h8s2+GovLrC/TJbnSIxz05484C+g69iqoMGxY6DBYOIdN +96qBNiTSJIGP8g4MQuDuHP8Itz1NEdB7MhGcXSdgKU+zFRYDUg+w8w3RZWqd/kO5JU0 fs1YasWW+DTAGwvJ72pFQKyWq0jX7/vYUUX54Sv7cJzKm5XCCZ9vCD/mEjo2OuKxFGe3 kUDMuPf09RhZgcDVcCB0rh+ldF7SzihnPb0ehMxNFeyiL7lL71cYJ2FcuA0b0HqD+S7K PcvQ== X-Forwarded-Encrypted: i=1; AJvYcCXssnGQ2XBobo2T4x8BB31+FvZLDNz0zC9EnCCPrv/LIfvzWFe2jtNuVsci4JwCG+6EKfdUgGroFahdtic=@vger.kernel.org X-Gm-Message-State: AOJu0YxpqTsJh2rF2ertWh7qOZoqzsUD1R9ooJAiO7YSCCLnAVYugbvs iDh5Lny0ttIFSqicgDKZQjvFgT9zbubOrhue7Ex/lypYNWjmuZy/I3Lu7yRjzdB7OIsi+3WaDvX TLDdOoqHBlAGwONVbz6XExg== X-Received: from wrbcp6.prod.google.com ([2002:a05:6000:4006:b0:435:a3c2:4195]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:64c4:0:b0:435:9f41:d54 with SMTP id ffacd0b85a97d-435ca1aeca7mr6603755f8f.60.1769424291423; Mon, 26 Jan 2026 02:44:51 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:17 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-29-vdonnefort@google.com> Subject: [PATCH v10 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 4302633A9C1 for ; Mon, 26 Jan 2026 10:44:54 +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=1769424296; cv=none; b=UvGVqrAZ5LTr4IcK5ukINmIkq1KUeQ5TFAxPX8VsvbO42QfskNByq+y3jMV8lXouNhOpLbGNnY/83I+gIMVsE73LqXZlG+QNZSxFxw9bdHWScCJGX7fLy5SR4TTtIXeZHZ71yIZLL3o10wUr5RHtQWIkj0U0UU2fIjpQrS/3098= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424296; c=relaxed/simple; bh=jc/1tMtJgbj0D+3+RNgTcGKl6/fF2uDcmqUjShgP6kg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=KdI+VN5UT0OaZ9UmjNcFHGQ/sbssINLcnF4YztIUuYc4Cj1zcmA3Ch3lZulTwi3xtIIg4tUS3WZr32WCxD8a92Er/I4wYh2wBWZdX/Nk5cRdjtagFnOdjt6c2y84NZwHCo38CnvUbMfKNX7myLt+V79aEPcjslWT/tVBFPWmnK8= 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=kCf6e4OO; 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="kCf6e4OO" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4779d8fd4ecso26802315e9.1 for ; Mon, 26 Jan 2026 02:44:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424292; x=1770029092; 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=NT+CpEP6PzXqQH6e99olRbkgz8yl4Nh6CScVnzMBNjw=; b=kCf6e4OOEEDofSixq6Tabv6fXMjHy2uBD+n9aEAv/xaK6wtDdy9M38f+aqxvlWcS1p xMWC1GGiC/2R4hbquaKS/GYIaiTsuParZft2SsAugOZ4tTFUvVeK8uZQjZpVdrFeWFwU Lt8K9FV7bEg9v029GtK8GuN3Gx9TKKYzquuwW6GOAprg/5k3IhobqlIr4BVhaXPsrzep G52eQOn3xaToItE5XXjI6+JCGNW/sn/Iqnd6fprJ6gGs9SWaZagm3WRgJvo0nd5hLab2 kfRWsG828gGbdCrNyv/ENfhPMungpQXoc2ejdGjB5gIWRUEUB4plqQ2Eq0rD4bNlvZAZ R6fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424292; x=1770029092; 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=NT+CpEP6PzXqQH6e99olRbkgz8yl4Nh6CScVnzMBNjw=; b=FcBpM2oT7HIvrfM3oNsNqxuRFdAKnECoCX/GlGF8tyZR0etPiCGzMHHvFxYZ3iRmJK tXjnYxYd+zJDxn0bdX0DVHnzlmL0boUaUu0CfkpYoOrkhRnO7p0X/g+hjI0fnf1pkFJ9 iJkPdP5cRmt768tgtkLUDlB9EcvzglQv4MJm+meiyuIklYG+zXk5upWVcmcgTMqyKEU4 d10uwU5sBY+S7ii/SmoZSqbytyhEtfZW/gJUFhsEXZqomEbSACaAHc2K805TBZvvqAhB xCd3mioaGHnuElBRtkNunB+LVOJb1HabBdYnwPSX1Yi8wDn87XLQcyTH5jHx7fROc6ep iocw== X-Forwarded-Encrypted: i=1; AJvYcCX568kFUkbKrbL3Fa9pSAmQ/sMqpJWdDlz7heFSLMRQZsYCOJicrn2lFbsMfcTvjciDtYgNbsHaq1lIAj8=@vger.kernel.org X-Gm-Message-State: AOJu0YyIdQQRlNSeIAEzRbuhPn6F1ebSZ/BGEJQB9QVu0XA0bbGy8cVz YoWYxP+xFsAcoL0CzurpCYazpTNB7gzrlZlNWNPdl1vWNcDelH+gQKFBdKUCQg7As0GLJEXLWYm Rev7JSe73Bjo4P1yedA1wBg== X-Received: from wmcv18.prod.google.com ([2002:a05:600c:4292:b0:47e:e776:2495]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:8b6a:b0:477:9e0c:f59 with SMTP id 5b1f17b1804b1-4805cd0e356mr65382385e9.2.1769424292276; Mon, 26 Jan 2026 02:44:52 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:18 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-30-vdonnefort@google.com> Subject: [PATCH v10 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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 10:03:20 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 9387733AD8E for ; Mon, 26 Jan 2026 10:44:55 +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=1769424298; cv=none; b=Pf1p+LWKa8nL/BbDKVuYiFSYR3JieFnemyqoEtdyGYKxY9FKrwg5q3qfIZxcL8lenQh4/MypfDLH9NpX15gsZj+Q5ESai4VSrX3dmFgUgQW+MrubZmohEeCVeiLubvdr7QKdb8Pp0XAhEoEPa/FQOHWv8/wGbfzMyuSf7Cxh+SU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769424298; c=relaxed/simple; bh=rQU0pqdKqe8avW/ctXbf7hWIvHSRj7RwdreDLZd/I2Y=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=S8Z/I/MbEV3s5n9LwPbLUQikyNajCpLhhCvnDbLvb5QUrGhVXVqOB79V+jYUr4GjHRi+UCrT3nZbMutg8UAfkLXbGGR1cCqYy/RmKYYYrUFW8C2ndYG/H8OSh6E97/LM1cY8StZzYlRfQY7lBdCMfDL2MJoKAorQfJx/NSQzbK4= 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=KmF2qS8v; 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="KmF2qS8v" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-48025e12b5bso48671195e9.2 for ; Mon, 26 Jan 2026 02:44:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769424293; x=1770029093; 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=rcuxT0tCf/T7ct2VsPnptK2x4TV5cU08DiX9A8D84RY=; b=KmF2qS8vEks4oLQEti44HDIhwkqWCFxpLdXAuTPNT8HX+fiwj9aG/22DjEnAcnojfU rSUwQpxEZp+ar4XLXFYMchEcykxcNdI1mYvwI4WcLj7OLfHHeLM1B0l168qGuQ68OTMG ilE/zA8d59buDyNmxf48ahtqN/P6Lj+/wJJYatcxnhCZre97FB8hZA0QZfLKsEBGPSiZ 2xEyOV7XSyV1pdOtELFkt4ofQj+5WhFhMLXVgLUJqtuxWYPjL83WSQv1wdqUKDvY88ic sMobctHtXfubhPIaEO30qMnqDEO4uiA45IFUKc+3REX2ODwgn5sJwJOywfgIOhwcJe/h sN1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769424293; x=1770029093; 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=rcuxT0tCf/T7ct2VsPnptK2x4TV5cU08DiX9A8D84RY=; b=wX4kArbNFsT7DC+3r3NDUnvm1agjJYSmLs6YCRivpCVH69dEGMD94aV6jLtmvrfl8R YZpXH+xOq5XlVZgjNlSmJk6PYQup2zaFrSs0duPNw94OFf81P49wLWN4BOSM6F3v/jSH QMD2UDMRdca3xZq3S4lF83F5weA6U6QdY4VKSuOZMoM7uxcXmBtf19P8vedhO5oA3+l0 iJw8ZgIYfSi1paT0qJ4b04dga9nQ0jOpzUNyMWR/LnaqXe7DP0o8ml60XnKc+HpR0FJq Avi7qxxuzQqmW6HWTqkKSLv6Wh/Gq57NrvOLojbsnJ71SWjjPMs5SNLa2PVRdV1ovB/w r2vQ== X-Forwarded-Encrypted: i=1; AJvYcCV4rzw/EuFa/jFmU3rAN0gKqQz5DuJFXkEIroh0f7HsvHxh1lFIvy8xC91IMFZKEYEmibG5xPnhOgVhf7k=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5yLi0x9SgFCrB/Ci4/QaVkXJe4GmvNaJuK7OwH/abSqJILNqF cyps32zIYhjqz3+eE7UmIJHAvIRJ79weQdfS769xu76XoHT2opuGMA5h0AQlqtoAFBrekjV+01c dPWqxPrztXwIP91H5jvWpkQ== X-Received: from wmbdn2.prod.google.com ([2002:a05:600c:6542:b0:477:9b3e:67e3]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3ba0:b0:47d:5d27:2a7f with SMTP id 5b1f17b1804b1-4805d064554mr67628505e9.26.1769424293569; Mon, 26 Jan 2026 02:44:53 -0800 (PST) Date: Mon, 26 Jan 2026 10:44:19 +0000 In-Reply-To: <20260126104419.1649811-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: <20260126104419.1649811-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260126104419.1649811-31-vdonnefort@google.com> Subject: [PATCH v10 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.52.0.457.g6b5491de43-goog