From nobody Sat Nov 23 02:13:21 2024 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 171D917C9F1 for ; Thu, 14 Nov 2024 15:41:28 +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=1731598889; cv=none; b=SBkwVzuw3nC2EjgEDRdr3/cnfsbv5ngwh6U20yGrWYMFV2TREXhbxa8nNeRx3pTWouYKOmeDImL2IifhhALUHrI161b8zOTG6FPtAQOE+GF7sz2GSpdFSuLvgCfTOsgYeA9FV/DayAfXYtpIqtE77csAlK6tiaY0NEX9+lSwCEQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731598889; c=relaxed/simple; bh=iGTk764dXrLuE3LmiA7X/sZSzRU69Oj0frD+5Y6PZlQ=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=gx/ZrLisZlsQ1VccTUxbemKqu3XvYC5HEZNFzskn2S+DUnlWar+HmcM9D2Qg1KxpIc9DT1r5hHfCRbGvXZR1I+8cOWslPXGqYiGaNDTJrixJIuXXgtt7AX3krLQlHC2ZYudtXFV5vVAqtcgMpovjcTeGnfxkBTItEvQHVbP+ETc= 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 CDC51C4CECD; Thu, 14 Nov 2024 15:41:27 +0000 (UTC) Date: Thu, 14 Nov 2024 10:41:49 -0500 From: Steven Rostedt To: Linus Torvalds Cc: LKML , Masami Hiramatsu , Mathieu Desnoyers Subject: [GIT PULL] ring-buffer: Revert previous fix as it wasn't the actual fix Message-ID: <20241114104149.1da4f584@gandalf.local.home> X-Mailer: Claws Mail 3.20.0git84 (GTK+ 2.24.33; x86_64-pc-linux-gnu) 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" Linus, Revert: "ring-buffer: Do not have boot mapped buffers hook to CPU hotplug" - A crash that happened on cpu hotplug was actually caused by the incorrect ref counting that was fixed by commit 2cf9733891a4 ("ring-buffer: Fix refcount setting of boot mapped buffers"). The removal of calling cpu hotplug callbacks on memory mapped buffers was not an issue even though the tests at the time pointed toward it. But in fact, there's a check in that code that tests to see if the buffers are already allocated or not, and will not allocate them again if they are. Not calling the cpu hotplug callbacks ended up not initializing the non boot CPU buffers. Simply remove that change. Please pull the latest trace-ringbuffer-v6.12-rc7 tree, which can be found = at: git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-ringbuffer-v6.12-rc7 Tag SHA1: 81ccc26cac30f76e5fb6d76aec178677c3e209ad Head SHA1: 580bb355bcae7e9a6606ce9644af09b2a793f1bb Steven Rostedt (1): Revert: "ring-buffer: Do not have boot mapped buffers hook to CPU hot= plug" ---- kernel/trace/ring_buffer.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) --------------------------- commit 580bb355bcae7e9a6606ce9644af09b2a793f1bb Author: Steven Rostedt Date: Wed Nov 13 23:08:39 2024 -0500 Revert: "ring-buffer: Do not have boot mapped buffers hook to CPU hotpl= ug" =20 A crash happened when testing cpu hotplug with respect to the memory mapped ring buffers. It was assumed that the hot plug code was adding a per CPU buffer that was already created that caused the crash. The real problem was due to ref counting and was fixed by commit 2cf9733891a4 ("ring-buffer: Fix refcount setting of boot mapped buffers"). =20 When a per CPU buffer is created, it will not be created again even with CPU hotplug, so the fix to not use CPU hotplug was a red herring. In fa= ct, it caused only the boot CPU buffer to be created, leaving the other CPU per CPU buffers disabled. =20 Revert that change as it was not the culprit of the fix it was intended= to be. =20 Cc: Masami Hiramatsu Cc: Mathieu Desnoyers Link: https://lore.kernel.org/20241113230839.6c03640f@gandalf.local.home Fixes: 912da2c384d5 ("ring-buffer: Do not have boot mapped buffers hook= to CPU hotplug") Signed-off-by: Steven Rostedt (Google) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 3ea4f7bb1837..5807116bcd0b 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -2337,12 +2337,9 @@ static struct trace_buffer *alloc_buffer(unsigned lo= ng size, unsigned flags, if (!buffer->buffers[cpu]) goto fail_free_buffers; =20 - /* If already mapped, do not hook to CPU hotplug */ - if (!start) { - ret =3D cpuhp_state_add_instance(CPUHP_TRACE_RB_PREPARE, &buffer->node); - if (ret < 0) - goto fail_free_buffers; - } + ret =3D cpuhp_state_add_instance(CPUHP_TRACE_RB_PREPARE, &buffer->node); + if (ret < 0) + goto fail_free_buffers; =20 mutex_init(&buffer->mutex);