From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 6575E37BE6A for ; Thu, 21 May 2026 13:47:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779371225; cv=none; b=ZSfbY3t4xBxg2Gc9AP1sRqY/IrJJNeWr3Q6DfdQ70pS6pU4GuL33pVSKIkGrojyrdlzzfOJjj1uz65g1hmWdeMeiQyS7qo81+0OT4pgzt4/6/mSTBoeEgJZjAqJSrH/cnTOZSSItLmplMs24yAU+qQth2PlfcwYq//m6ZNPHbAw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779371225; c=relaxed/simple; bh=rP+WnGwz1FcEVciOzghel2ALRqmEA82Tbhd3o0IdQjg=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=eXkT7yXqCsiq74dGlZn/yaOmBxHXqax+eMnYmp80NgEQIFYlPEyUNFKRLEu50EGTm8VchQQHK+gdWcEL22t7a/xvWEH73yHFD0KZ/wehL9xa7ZxrUA4NE3QJu2oVs4zvkCgkOWt5OzaDwa3uDXAbc9dIDUSoUKZITS+WdGv0zH4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BEsyF3Wy; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BEsyF3Wy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B5E01F00ADE; Thu, 21 May 2026 13:47:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779371224; bh=nTJ61wXaXZbaJ71A6SRncamqCeqTfeu6ZHV7bFIcNCQ=; h=Date:From:To:Cc:Subject:References; b=BEsyF3WyaDDWaYzkdlNgn0DOcPqWxQItAWUp3hvkF8IHBhAarojTqWWJvw3AR6+Yp ruYwkzIENJCeTGO1vIrhfGJoxDDnzpfhoFzjusW8rbwyYx985paWLAjRZeLmHArd71 HvGfQxcbTsuDOEva7X9aYKMPWa+xBBR4fc6i3kNQXbPnDGdhxpC625L/O3EA1LuuIj 3Rqven9A2LvB7D4jMnYHim5zU3efWmw7mKtAhiDGZ7/dzdrG6dmUEnrODrJAtw99MF rUoS6G+4qMKOdWyLQKiBlvfJrvGvYJVmQQU669CqHu2hhu9RjF4pHHu7nFeC1pyIT7 OyAwOc5VYWUCg== Received: from rostedt by gandalf with local (Exim 4.99.2) (envelope-from ) id 1wQ3kD-00000005MRy-2cpa; Thu, 21 May 2026 09:47:25 -0400 Message-ID: <20260521134725.477015754@kernel.org> User-Agent: quilt/0.69 Date: Thu, 21 May 2026 09:47:14 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Vincent Donnefort Subject: [for-linus][PATCH 4/5] tracing: Fix unload_page for simple_ring_buffer init rollback References: <20260521134710.628917428@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 From: Vincent Donnefort The unload_page callback expects the return value of load_page() as its argument: ret = load_page(va); unload(ret). Fix the rollback code in simple_ring_buffer_init_mm() where the descriptor's VA is used instead of the loaded page address. Link: https://patch.msgid.link/20260512141614.1759430-1-vdonnefort@google.com Fixes: 635923081c79 ("tracing: load/unload page callbacks for simple_ring_buffer") Signed-off-by: Vincent Donnefort Signed-off-by: Steven Rostedt --- kernel/trace/simple_ring_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/simple_ring_buffer.c b/kernel/trace/simple_ring_buffer.c index f731f14d0ff7..f4642f5adda3 100644 --- a/kernel/trace/simple_ring_buffer.c +++ b/kernel/trace/simple_ring_buffer.c @@ -430,7 +430,7 @@ int simple_ring_buffer_init_mm(struct simple_rb_per_cpu *cpu_buffer, if (ret) { for (i--; i >= 0; i--) - unload_page((void *)desc->page_va[i]); + unload_page(bpages[i].page); unload_page(cpu_buffer->meta); return ret; -- 2.53.0