From nobody Wed Dec 17 08:03:44 2025 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 75E1730BB94 for ; Tue, 2 Dec 2025 09:36:35 +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=1764668197; cv=none; b=QAhY2mFNcW/cadzz4lJ5dfWNLCxoLKq5ZM5Q8AMVTjlaDFBrIbYVjR696WrHiiu56niPIkA4cg2cVmc8tMfKeorEknYHoRjmy0nGZ4vChi69ECYS5p5GIbp2l+Ux4C9gHfuWnZEucGY8UwrbSkaufBiTUl4Wp7A9MOtWeSSfDQU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764668197; c=relaxed/simple; bh=aQGInIrpJpA9FnPWwTp9VkPt/Pn8+5NuCILdhnrWbUc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=W+ga5e90iZCqR+WoB/nlQzeKSEnP6pdvt+9cT9RaJroMZ6iLGSkqQMys/6DY/Va7IuVzgFd+o2XYdqLdFaFtwQRtWTHPVz95gsqhiFIgVPLFoeuZfduy0TcigUXhiAaZ0oAehLfBUyDED1iMW1jQOeTQl5K1zLKkINCfSiQkgxs= 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=s1FKUyuI; 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="s1FKUyuI" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-42e2d5e833fso1339538f8f.1 for ; Tue, 02 Dec 2025 01:36:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764668194; x=1765272994; 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=NaTp/V/0VQ5wl0NsKdZIsTivJaVp4Jv+4QO5H0MFmfw=; b=s1FKUyuI+T2yeHS2MNMVdkyHWYJ1Sn3AR8tDhsvtTx1+052+bNwCexEQ2/ezvLCsU4 aH7IHp1FHkzBYcCt87PHxokMsrCrez/jeHhIVihbsdYppf9C6u++ipeYsgoUYsLlRVPw H5GgWGvtZaKhc5MYuaek6Y3xkR1IzMCad9PRfLgNAvNeOQk6x85/2q/be9BANmxZvl4U SRGcYEdn6p07VhLMRu2XijaxpGM/IdYE/cRZ2pw2pWkrAJ8cYge6Aw6gwvHSg2umvCNy Lo5F3ttqdMjT+bOed1CI7mtn7XFKIHq4myVuV5KeIzaqedsSK3qRHRZoKYAO01FLqI4s 4rVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764668194; x=1765272994; 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=NaTp/V/0VQ5wl0NsKdZIsTivJaVp4Jv+4QO5H0MFmfw=; b=Jums7l7feHxUZM9vLFkPaTs8cPP+teOSUmZTJQjNxxJt1YIXTu3ydlq5kXcWGpQm40 HsOA59Mksk9NpfX00SBakwfVyypLxo65UkeLhgjpmtVvybl9lPeLhfl+wd+bzSXg2xU7 fzHxRtzcwZiPw7fTwQeTBh5hasIanxQq8O/AEWl/KAiw2TlDvwSGC6LW5YXtSWH86qvd jKk1njuiqT3bTrpZ10LPjzblNMVcAp4pWJAzvLZ7SVlxcIFHZ6qujR4t7M91tFn18oiq vAKglJO8JY1nmYcIhBTtLbeu6mwDzwtZhuRAyViLn7BsZkeQdPt8wu3w/rznavx3GiFc z/HA== X-Forwarded-Encrypted: i=1; AJvYcCXQgrKLkS/Yt0Wq+Qh6Imn64ljtd9Aw6igcmnbK9E2yXSFT/6REQkSRsT6/+jE5wy9y/3YuSUxjUsPoMlM=@vger.kernel.org X-Gm-Message-State: AOJu0YxobpRUa3/bcfjj/iAmXf7W4D7eKdn3T6vxe3Z+cC/d6OBfYOaZ h5STrxySnEY82H8BQ7ZJnPZrUE4ls+vNCSsFi8ufFAa2lwJdpF/W7dPe90E4PWdIZFGQhVPVp5S Vhwnfyi+k2aXs1ci9Yf4oiQ== X-Google-Smtp-Source: AGHT+IEO0w7C8+uzCJhGJFqeafT3tVd3XPzAjaD/lM28eUt2wOIl7EbpNMo+Y4PRXxdjJMuNc5RxsiVPK9HaRiCy X-Received: from wruh15.prod.google.com ([2002:a5d:688f:0:b0:42b:3951:1b]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:5c89:0:b0:42b:5448:7b11 with SMTP id ffacd0b85a97d-42cc1cf3abdmr45886784f8f.33.1764668193695; Tue, 02 Dec 2025 01:36:33 -0800 (PST) Date: Tue, 2 Dec 2025 09:35:55 +0000 In-Reply-To: <20251202093623.2337860-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: <20251202093623.2337860-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.107.ga0afd4fd5b-goog Message-ID: <20251202093623.2337860-3-vdonnefort@google.com> Subject: [PATCH v9 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 048dde717b94..aeff2ce6231a 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -519,7 +519,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 @@ -7002,7 +7002,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; @@ -7011,7 +7011,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); @@ -7021,7 +7021,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++; @@ -7030,7 +7030,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); @@ -7186,13 +7186,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) @@ -7219,7 +7221,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)) @@ -7243,7 +7246,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.107.ga0afd4fd5b-goog