From nobody Wed Dec 17 15:43:05 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D9FDC1A01B3 for ; Tue, 16 Jul 2024 18:03:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721152985; cv=none; b=SBcXFFeLjFyU/5xEeW0k1FPZj2EZIPSsulBAVV0dYIVqwOUx1RPn7gMJku19p5nZcVQb4/pVaU6ZcA2WLvWmU9zwlAOOI+sadzHf177HpLrKtlEyDuroNxxrb0fSsiR9Yy6HDrLAwtXfRGnmU0LV2K+QjGlRxR7C010xT978OKY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721152985; c=relaxed/simple; bh=e99cUqpAw0Ze+FD8QbMChbZyDn00kbYml6vaF7x7WKQ=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=nD7WxqNaYoJcvZDLL7SlDpQrXlAG2btrfPIsmlSvK6qiRp64Bpy03RV8osUxMIPpZj9eTpN/4tG6PviR1Y/tFP0yFMH/pzFEKnQfOpRCRgKnCQNeb9PXlrIhwNkVOVr+vaaeqswh4OPekAD4yVbnNozJtmtPVgbDT4tx9syBzXk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 630C3C4AF0B; Tue, 16 Jul 2024 18:03:05 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98) (envelope-from ) id 1sTmW0-000000006uJ-3K6U; Tue, 16 Jul 2024 14:03:04 -0400 Message-ID: <20240716180304.655162704@goodmis.org> User-Agent: quilt/0.68 Date: Tue, 16 Jul 2024 14:02:24 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Dan Carpenter Subject: [for-next][PATCH 1/2] tracing: Fix NULL vs IS_ERR() check in enable_instances() References: <20240716180223.593493907@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Dan Carpenter The trace_array_create_systems() function returns error pointers, not NULL. Fix the check to match. Cc: Masami Hiramatsu Cc: Mathieu Desnoyers Fixes: e645535a954a ("tracing: Add option to use memmapped memory for trace= boot instance") Link: https://lore.kernel.org/9b23ea03-d709-435f-a309-461c3d747457@moroto.m= ountain Signed-off-by: Dan Carpenter Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 71cca10581d6..5462fb10ff64 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -10507,7 +10507,7 @@ __init static void enable_instances(void) } =20 tr =3D trace_array_create_systems(name, NULL, addr, size); - if (!tr) { + if (IS_ERR(tr)) { pr_warn("Tracing: Failed to create instance buffer %s\n", curr_str); continue; } --=20 2.43.0 From nobody Wed Dec 17 15:43:05 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42C771F171 for ; Tue, 16 Jul 2024 18:03:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721152985; cv=none; b=e93b249UEM7agglkkN4Ds85UiA/pz5kEnoBpon/3cR3UapTHkeS+4x43h1bpQYHn2FFFoslJ5/Xisrd/cAqNvvS21UZY8jYyJjePxPEkpVPalv5Xe0lFtIMD06QdQgnpOIZCJoujGV3GZ9qW/gO7vCIwl93OwWJBWx+FB8p2IMs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721152985; c=relaxed/simple; bh=7186V2TRd+OaiPmU8Xg5fvW4L5o7oZ6hBTVZpAjqFuk=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=ApNFNeCdBZwrMECQo8WQGxYLjpAVMW9VwSZGKW8nHh8dOQiAuicbO3/20s54oLyKRY4adXXzoMogWsmX4TSCTCpD3rmM3Uz04Uks2X9neABJ3DFCczQnAMyYXUj9kUK9hr3rZBnkxbZKUzKzqXPvRUEEw+afv40dBVknjQeqv5M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8D42C116B1; Tue, 16 Jul 2024 18:03:04 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98) (envelope-from ) id 1sTmW0-000000006uo-3zov; Tue, 16 Jul 2024 14:03:04 -0400 Message-ID: <20240716180304.814359868@goodmis.org> User-Agent: quilt/0.68 Date: Tue, 16 Jul 2024 14:02:25 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Thorsten Blum Subject: [for-next][PATCH 2/2] ring-buffer: Use vma_pages() helper function References: <20240716180223.593493907@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Thorsten Blum Use the vma_pages() helper function and fix the following Coccinelle/coccicheck warning reported by vma_pages.cocci: WARNING: Consider using vma_pages helper on vma Rename the local variable vma_pages accordingly. Signed-off-by: Thorsten Blum Link: https://lore.kernel.org/20240709215657.322071-2-thorsten.blum@toblux.= com Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ring_buffer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index f3d772461a60..d59cf0023e38 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -6920,7 +6920,7 @@ static int __rb_inc_dec_mapped(struct ring_buffer_per= _cpu *cpu_buffer, static int __rb_map_vma(struct ring_buffer_per_cpu *cpu_buffer, struct vm_area_struct *vma) { - unsigned long nr_subbufs, nr_pages, vma_pages, pgoff =3D vma->vm_pgoff; + unsigned long nr_subbufs, nr_pages, nr_vma_pages, pgoff =3D vma->vm_pgoff; unsigned int subbuf_pages, subbuf_order; struct page **pages; int p =3D 0, s =3D 0; @@ -6946,11 +6946,11 @@ static int __rb_map_vma(struct ring_buffer_per_cpu = *cpu_buffer, nr_subbufs =3D cpu_buffer->nr_pages + 1; /* + reader-subbuf */ nr_pages =3D ((nr_subbufs) << subbuf_order) - pgoff + 1; /* + meta-page */ =20 - vma_pages =3D (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; - if (!vma_pages || vma_pages > nr_pages) + nr_vma_pages =3D vma_pages(vma); + if (!nr_vma_pages || nr_vma_pages > nr_pages) return -EINVAL; =20 - nr_pages =3D vma_pages; + nr_pages =3D nr_vma_pages; =20 pages =3D kcalloc(nr_pages, sizeof(*pages), GFP_KERNEL); if (!pages) --=20 2.43.0