From patchwork Wed Mar 15 09:59:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 9625151 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 5181960244 for ; Wed, 15 Mar 2017 09:59:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3799028304 for ; Wed, 15 Mar 2017 09:59:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C838283BA; Wed, 15 Mar 2017 09:59:39 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BB20428304 for ; Wed, 15 Mar 2017 09:59:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=oIuQV90W8w8Oao3P2Mw/YFEOD8yAH+sHwUlmw0gClCE=; b=rH8tKJYkgS1k60IiGUtXdLD4SF K29eM64WqY22CqN2nbxIBBKHBrEert8Ac7nhi1b/WivfYuAPaWyn6bJG7vnSaolwRur8M/Spj5ZvG KQqHb8v9Xcoiwla1z3grFshGQGNkvdiZKl5IXMFAtGiJKXHulYcab7LmHqfz0/E6VlojseTIE867X yZ6BKB94E4g7ykKZCmvfWapWigSxSPFP/ZoFa7geJjWZC4pj+jUaSzcLenlJuuMhisw+6SHGKcNk8 RTSe6CePpKGByVagFrP2IXMH+f3SDIfxLrEwVV9Bh02RxVufjCKrNl+GAhE8QtMmggLOpCmtYK2BL o8JlEDPA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1co5iQ-0005bg-CZ; Wed, 15 Mar 2017 09:59:34 +0000 Received: from mail-pg0-x232.google.com ([2607:f8b0:400e:c05::232]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1co5gy-0003Xa-W5 for linux-arm-kernel@lists.infradead.org; Wed, 15 Mar 2017 09:58:12 +0000 Received: by mail-pg0-x232.google.com with SMTP id b129so6986416pgc.2 for ; Wed, 15 Mar 2017 02:57:44 -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=WKoDzUE+AHjC5Xtd5I7T+8alchpDIcVc+y3ZaK2IgFc=; b=RkqcYcQJYpC1rsI5LtDldeJN1aKMfnexjilaV+I1esg4S7plXYSP9AKos8i41E9dRs mn/wnZD/ujyOQUHTr3MBD4/qvHtdV6tSUqBAaAQnv78mDgHegEZOj6+gnJOIDUDBzFn5 5ukJ4/QOxBQdKuCf8RtFDgfVnJjrAi09e87UE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WKoDzUE+AHjC5Xtd5I7T+8alchpDIcVc+y3ZaK2IgFc=; b=ZtVFD6ERzckWvDaPDfaOQvvnzo2UxkX3q2CY0ahHGY58KrFTIZ8BJqXfPbGqVbJlb4 8tYDuYr0qOYR4zBe1jO/SCP4vhahesCMD1+6C9EiP3E90m3jjXoEBlfa/QC2Pn6a55Iw 7LAqDAm5rPlGvrwn0XLpQhMX7M10cATYzMju2IfixcvWeTarSxn3URLDFR2XlW/9Gujs ML1pHB5+K1H/eAlsAySIUPVK1KiziQ+0CgfFLEuQu57BRtsFob5gJSYrE54t3VWIqOh1 lT+BajDDEvTQjIJrPjm67rp7zZ+ve7oBG5TaWHvIG0huFmh3TVfK4h/0MJEK1ck+k4WP H/xw== X-Gm-Message-State: AFeK/H1yQR3oKNErZPfurONYH/Fq++3PnZnCVGC7qos3JrZ/Yzl+7cM3NSOLE0orrcnDjSBh X-Received: by 10.99.50.70 with SMTP id y67mr2603595pgy.109.1489571864015; Wed, 15 Mar 2017 02:57:44 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id f125sm3227059pfc.4.2017.03.15.02.57.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Mar 2017 02:57:43 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com Subject: [PATCH v33 09/14] arm64: kdump: add VMCOREINFO's for user-space tools Date: Wed, 15 Mar 2017 18:59:38 +0900 Message-Id: <20170315095941.25119-7-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170315095656.24992-1-takahiro.akashi@linaro.org> References: <20170315095656.24992-1-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170315_025805_382534_8E1040FF X-CRM114-Status: GOOD ( 10.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 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 Acked-by: Catalin Marinas --- 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 2c1108c51d69..68b96ea13b4c 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -351,3 +352,13 @@ void crash_free_reserved_phys_range(unsigned long begin, unsigned long end) } } #endif /* CONFIG_HIBERNATION */ + +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); +}