From nobody Fri Dec 19 21:50:03 2025 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 A6613319609 for ; Fri, 7 Nov 2025 09:39:06 +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=1762508349; cv=none; b=ihhc/OIto/KqKa3cVSwJBAMdnxkjYWi0byb7C0lIO1QPRwiwbmw0wlQiek60q7SZLQ+4n9OIqALarcvxGdT3hCOoP5WxMSRzcLjdCxZBB7vtnQ+N48sKUHDTyxsebX3LRmgkQ8razzD7Y3rzP1Ej+duwZTi/ES7ienZtlUon24I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762508349; c=relaxed/simple; bh=dY7C453YZMX6SBLG8P500Szez+LU0ktEnpERcQvizoA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=uAxekh1q7QltP0N5VhXGDIfqigxQ6zS5FTG2cyUhs+8l2heYzl5if4+8U7X7PwXWbkGYndIMnOdVK18C9iJZnPG5SBe9Eq4N3MWg4sG90yHX815B85Uj6nZPb1NDZOvo9oMWLqGYVHZKm7DAx2kaWyEgKc7m7bUnrOSjC4qJ/zM= 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=RLBv21Ri; 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="RLBv21Ri" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-47754c0796cso4517275e9.3 for ; Fri, 07 Nov 2025 01:39:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1762508345; x=1763113145; 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=Ce/zCDzb2G2ckswnrXnLfB3O70YfrWa+rKSIYEMNvwM=; b=RLBv21RipOQMzbT+nLTCkSAMKgpceUhHS2h+pgjGywZI8Xmp7k1DTyd4m2iqsUa94H efMd3Ir6oY36kiK7F/mBuwRfVMapRJevKR87qHLY0YPbLsrjfVyStFuiskpPm2DxdKDP jIOWvKmWdZy2aJ4dsr1Oy8PixaoFFD5GZ/XW2L3xX0xsV35cWiwUZKptg/8I9J4sJa8j hb7R+56qU1HIPSFt9hm836wR39qnbUN/ftyoGg7ctqrL2DByaZW1P19qYG9KK/gmlAR+ kp8Y4/Lkk/Qw+L90AWlDb717QhIod88EC84ktKOoBtqWAdvfOEZ+carkX21RuBNIvp1m iFEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762508345; x=1763113145; 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=Ce/zCDzb2G2ckswnrXnLfB3O70YfrWa+rKSIYEMNvwM=; b=JI47em+FrLql/tKbsVx5neVoMgxmy5UYB+qQs3x3G9oHzmazYHiSQORfyZSIpS+hSG UOVGqRnKNwevwUG3R99h7GMs6R22dx2Y9D4RxdQt9+c1wpfal+g+tItJZjX+GqJcDYnW 9autHv4BzM3rBw+rO3L3GjSCtuCZkot0YX1rbf5PMZsEIUpoIyYzmP/fhUqdXNeTmGVu Uq0K+NDpN132asEgEw0H8XiPbLQm2H3EH2vtjLnI9nWwDKtfrUm0DfWSmkTd7YRxUZJY RjRgqHrjMsm7UlDgHRQIvSeFZ+l0iWGBgYqWr6bd1BtDkiQYOkYBzoSbeODWDpaCBDqF vkkA== X-Forwarded-Encrypted: i=1; AJvYcCVlFjd81KwNH+47I5lEynngl5KoHGbW727OZ42p/jfJGsuN4aeNHpaE14f0Zy3FX6XXZWsu2omy6HQhHVI=@vger.kernel.org X-Gm-Message-State: AOJu0Yx+iceNTEy4pZCApwAdVs6kot3sOLzHEuFFzYfhYsY3bGMBI+RC 3r0e1r5Nf9Lag4jSzj72Z4LxGN9if2YZQaVVYPbDxiVpU7DzOGA65rhZpnJ4CwNsK/GtHtjSObj XB2AUvE+vOp+q269olsc1iA== X-Google-Smtp-Source: AGHT+IHH6KySUg+bVxUdc2Vx4JCZPm6fDNIkH+y4qKSJ90mdCNMhcU8xm4yct+fqYgyGXkQZSGI0QTJtlUIwPdd8 X-Received: from wmof18.prod.google.com ([2002:a05:600c:44d2:b0:46e:2eb4:38d]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1381:b0:477:fad:acd9 with SMTP id 5b1f17b1804b1-4776bcc5191mr24288135e9.34.1762508344724; Fri, 07 Nov 2025 01:39:04 -0800 (PST) Date: Fri, 7 Nov 2025 09:38:29 +0000 In-Reply-To: <20251107093840.3779150-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: <20251107093840.3779150-1-vdonnefort@google.com> X-Mailer: git-send-email 2.51.2.1041.gc1ab5b90ca-goog Message-ID: <20251107093840.3779150-18-vdonnefort@google.com> Subject: [PATCH v8 17/28] 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.51.2.1041.gc1ab5b90ca-goog