From patchwork Wed Nov 2 04:52:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 9408465 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 B19FD60721 for ; Wed, 2 Nov 2016 04:48:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A324129DFE for ; Wed, 2 Nov 2016 04:48:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9735229E00; Wed, 2 Nov 2016 04:48:30 +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 2B38929DFE for ; Wed, 2 Nov 2016 04:48:30 +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 1c1nRe-0005FB-K8; Wed, 02 Nov 2016 04:46:38 +0000 Received: from mail-pf0-x22d.google.com ([2607:f8b0:400e:c00::22d]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c1nQW-0003Qr-3N for linux-arm-kernel@lists.infradead.org; Wed, 02 Nov 2016 04:45:30 +0000 Received: by mail-pf0-x22d.google.com with SMTP id n85so4272126pfi.1 for ; Tue, 01 Nov 2016 21:45:07 -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=qeFsZ0K2dcpP68d4btvy4DcShi2pSfzLCf+dSMyoxro=; b=Beo9tndQa/AQV+8nR1F4EMPYkRDTwPZ0A7VIIRPZjZqRY/TA6EcFxICWz+9Bneo4tc Gd8Y6h9/Ym25sMh3HcjWtA+KE9DSXnc8m37sSd0BXcKXg8AbksP2Kjw5bDxQURhKsCXc NiTR3nGFsPkdRg7XMHXpMietqIf4ZQZZEKwms= 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=qeFsZ0K2dcpP68d4btvy4DcShi2pSfzLCf+dSMyoxro=; b=aiMhEJ+aNoxpB9Mtl4xIkFeaXOFFLEMgHBhE+7b4omSbkoeK/qf8YnjwsbtnzKNfKC Iz7KQ4Wfwvnd+2TU45/M0y5xvUUfzGwE7Q2jRm5BIuY5iI3ULtPhGp4bDBUQ+i5aZldt UgHqr8wu1rLH6+v2tVrY9vfg/c1yKdpKMJTnhvdYQaUbh5z8QmXXBhV1vsJYByn7m32/ 8qBzg7J75VLQXxW3HB333g3+p6G8/ImzyV2ikG+H/4KS1zh4YgRunpjOlbVFlLwfhk5P 4Ts8igfFiobgxCy27ocAXClapQsQQL56OgPFuQE56SQ0iinguk8vAIyr1SQoSSVec65w mb5Q== X-Gm-Message-State: ABUngvcvEEnROQcLJryhXGSfiDVQTYFVNbEtR1+3G5FbmcwwuxdJaLjKv7C/Urw4LUdkBaku X-Received: by 10.99.5.21 with SMTP id 21mr2764632pgf.32.1478061907345; Tue, 01 Nov 2016 21:45:07 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id j68sm439816pfk.95.2016.11.01.21.45.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Nov 2016 21:45:06 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com Subject: [PATCH v27 5/9] arm64: kdump: add VMCOREINFO's for user-space tools Date: Wed, 2 Nov 2016 13:52:46 +0900 Message-Id: <20161102045249.12058-4-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161102044959.11954-1-takahiro.akashi@linaro.org> References: <20161102044959.11954-1-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161101_214528_314719_B8617E2E X-CRM114-Status: GOOD ( 11.18 ) 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 In addition to common VMCOREINFO's defined in crash_save_vmcoreinfo_init(), we need to know, for crash utility, - kimage_voffset - PHYS_OFFSET to examine the contents of a dump file (/proc/vmcore) correctly due to the introduction of KASLR (CONFIG_RANDOMIZE_BASE) in v4.6. - VA_BITS is also required for makedumpfile command. arch_crash_save_vmcoreinfo() appends them to the dump file. 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 c60346d..994fe0b 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); +}