From patchwork Tue Jun 11 21:56:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 13694226 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 48C5115250F; Tue, 11 Jun 2024 21:57:45 +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=1718143065; cv=none; b=qLbvgCoe4GJDImsuNGrYD+N1AeylikeWEzYHf9HebwdpeyYuw1db5lIxH1PxW6xNXBQb9y5og7upiH6ChBgu1k3JeGzrkIx9GWexVaKvfqdeAkO70bPj6GeYckWrzuGIdBLZt4nxqDy1al1fhCM8d6Zpki4e0Gtwz3hS5Nfqq1c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718143065; c=relaxed/simple; bh=XWPf3qjTy7vJ5c4XKuZen+qKdlltorfzfcFi2nOi4uM=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=I+kGma29IEfK5BBlZgZDps8RiZbeCYgNprZF9ArfcX+hblfKQroSX+zOSHoqFOX/7BDMwGr5cTEtQ0hDRpIWLUrhZxD9aycj0ACGwhyfay49MgSUbtuFk4u0mZjt655iB8R4jlnwnGzSnEKVrEDPrMNy+EQAhPXhJr2mMB7fjeI= 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 EC5BDC4AF52; Tue, 11 Jun 2024 21:57:44 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1sH9VB-00000001VTw-39PZ; Tue, 11 Jun 2024 17:58:01 -0400 Message-ID: <20240611215801.605742243@goodmis.org> User-Agent: quilt/0.68 Date: Tue, 11 Jun 2024 17:56:12 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , linux-mm@kvack.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Peter Zijlstra , Kees Cook , Tony Luck , "Guilherme G. Piccoli" , linux-hardening@vger.kernel.org, Guenter Roeck , Ross Zwisler , wklin@google.com, Vineeth Remanan Pillai , Joel Fernandes , Suleiman Souhlal , Linus Torvalds , Catalin Marinas , Will Deacon , Ard Biesheuvel , Mike Rapoport Subject: [PATCH v4 2/2] pstore/ramoops: Add ramoops.mem_name= command line option References: <20240611215610.548854415@goodmis.org> Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: "Steven Rostedt (Google)" Add a method to find a region specified by reserve_mem=nn:align:name for ramoops. Adding a kernel command line parameter: reserve_mem=12M:4096:oops ramoops.mem_name=oops Will use the size and location defined by the memmap parameter where it finds the memory and labels it "oops". The "oops" in the ramoops option is used to search for it. This allows for arbitrary RAM to be used for ramoops if it is known that the memory is not cleared on kernel crashes or soft reboots. Signed-off-by: Steven Rostedt (Google) Reviewed-by: Guenter Roeck --- Changes since v3: https://lore.kernel.org/linux-trace-kernel/20240606150316.916395285@goodmis.org - Change type of start and size to phys_addr_t fs/pstore/ram.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index b1a455f42e93..4311fcbc84f2 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -50,6 +50,10 @@ module_param_hw(mem_address, ullong, other, 0400); MODULE_PARM_DESC(mem_address, "start of reserved RAM used to store oops/panic logs"); +static char *mem_name; +module_param_named(mem_name, mem_name, charp, 0400); +MODULE_PARM_DESC(mem_name, "name of kernel param that holds addr"); + static ulong mem_size; module_param(mem_size, ulong, 0400); MODULE_PARM_DESC(mem_size, @@ -914,6 +918,16 @@ static void __init ramoops_register_dummy(void) { struct ramoops_platform_data pdata; + if (mem_name) { + phys_addr_t start; + phys_addr_t size; + + if (reserve_mem_find_by_name(mem_name, &start, &size)) { + mem_address = start; + mem_size = size; + } + } + /* * Prepare a dummy platform data structure to carry the module * parameters. If mem_size isn't set, then there are no module