From patchwork Wed Sep 7 04:29:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 9318173 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D0B92607D3 for ; Wed, 7 Sep 2016 04:26:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3F9328DF6 for ; Wed, 7 Sep 2016 04:26:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B84EC28FFD; Wed, 7 Sep 2016 04:26:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5314C28DF6 for ; Wed, 7 Sep 2016 04:26:36 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bhUQ2-0001iN-Um; Wed, 07 Sep 2016 04:25:02 +0000 Received: from mail-pa0-x22f.google.com ([2607:f8b0:400e:c03::22f]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bhUPI-00019C-D7 for linux-arm-kernel@lists.infradead.org; Wed, 07 Sep 2016 04:24:21 +0000 Received: by mail-pa0-x22f.google.com with SMTP id b2so1942199pat.2 for ; Tue, 06 Sep 2016 21:23:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/FPfmAAJG7R9mCli4ZR8ayUGAdWaNX4oOp3vX9Zknv0=; b=QbK1M5eYyysX1ShAN6eVQD4p5u9aDJvi3QXvxCV3WFM8SzYsCX6WywyQjZqttJUDs6 hfoPtW0mzWhhexkApp5832plKrf88xyTqelSmxj0KnSIvGA/xjDxplSZM/H/PIO1Ht5o jkINhaShoqgQ0RUbuSA7Dz3KM8f6cBKkdxsps= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/FPfmAAJG7R9mCli4ZR8ayUGAdWaNX4oOp3vX9Zknv0=; b=gBfL6BKDbup3L8mOkKz2ITuYE581XaJOBWDjCL7IvUopIhHaO9Xto/ja0kBgon7CIt YNZce36Uf9p+bQhmh786Jf2EsbSdsr3JWirFP5eWAaG2umlxhNEKytLVHeTeVAt1E8Jb HyxGWRgAJCU8Vt0J5VqxfQJZRGtgzIhJhNkBPhNCAdUxjCxlmrapGG7hXesxNyjUqUUc oUBPE1wY7Q6lLbWIn7YS7hr3s4OLtB0xZJIEbrMpk9AVJ2ZSXd82dFjI9XwzLJDNY8QO in9giszJI7wZtoOvloWFFXyfD6HsPkPWfOJ87eF3N5J/KRq21D7l8B4FvF8cs5db0cAf JN9g== X-Gm-Message-State: AE9vXwPDqZsDp16duyQGZv4TEy6a6rrNbln3KJHFOF40bkcxFoBYYvgoWT9qFpHB/ZIyCsEV X-Received: by 10.66.197.131 with SMTP id iu3mr78673450pac.97.1473222235528; Tue, 06 Sep 2016 21:23:55 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id q62sm22696484pfd.29.2016.09.06.21.23.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Sep 2016 21:23:55 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com Subject: [PATCH v26 4/7] arm64: kdump: add VMCOREINFO's for user-space coredump tools Date: Wed, 7 Sep 2016 13:29:06 +0900 Message-Id: <20160907042908.6232-5-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160907042908.6232-1-takahiro.akashi@linaro.org> References: <20160907042908.6232-1-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160906_212416_801530_18D242B6 X-CRM114-Status: GOOD ( 11.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, geoff@infradead.org, kexec@lists.infradead.org, AKASHI Takahiro , james.morse@arm.com, bauerman@linux.vnet.ibm.com, dyoung@redhat.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP For the current crash utility, we need to know, at least, - kimage_voffset - PHYS_OFFSET to handle the contents of core dump file (/proc/vmcore) correctly due to the introduction of KASLR (CONFIG_RANDOMIZE_BASE) in v4.6. This patch puts them as VMCOREINFO's into the file. - VA_BITS is also added for makedumpfile command. More VMCOREINFO's may be added later. Signed-off-by: AKASHI Takahiro Reviewed-by: James Morse --- arch/arm64/kernel/machine_kexec.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c index 8ac9dba8..38b4411 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -17,6 +17,7 @@ #include #include +#include #include #include "cpu-reset.h" @@ -260,3 +261,13 @@ void machine_crash_shutdown(struct pt_regs *regs) pr_info("Starting crashdump kernel...\n"); } + +void arch_crash_save_vmcoreinfo(void) +{ + VMCOREINFO_NUMBER(VA_BITS); + /* Please note VMCOREINFO_NUMBER() uses "%d", not "%x" */ + vmcoreinfo_append_str("NUMBER(kimage_voffset)=0x%llx\n", + kimage_voffset); + vmcoreinfo_append_str("NUMBER(PHYS_OFFSET)=0x%llx\n", + PHYS_OFFSET); +}