From patchwork Mon Mar 14 20:01:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalesh Singh X-Patchwork-Id: 12780751 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F405AC433F5 for ; Mon, 14 Mar 2022 20:09:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:From:Subject:References:Mime-Version :Message-Id:In-Reply-To:Date:Reply-To:To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=QWeE7ealr7tsIkBE3buStFMYzgLHtUCW1cbSubpqixM=; b=XJ9CBYtPnM74LF srZ7Nv7VPPMEYtguhjyJslhMXfKIAWmdg+5xomOc5Rbjia5PQ9h3F2D7U9gxyRarWULOrODTefIqL HC9yGtRY1os14n2+BWZ0KIxr13et9YbXVCkHKZt55meymMZw6CSIfCM2UldNw2dnBIROp+8C2kZjh Luk8sdSR9OaXz7VMARrMShcE7B/6RSIn2YAoGts9K1So9PE0f+cnyyUi/xEt9MM0zAiE55tuwaQo+ eTvK6nTIyoMzhw+A0neo+z4xRpKm9uE1sb8yZn4kFP/N03PQkEP2Eh1QnlhYDZN2PBm0oba7VYL9o omf8/LdBYXB0aQnS9M7Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTqyc-006j8I-Jn; Mon, 14 Mar 2022 20:07:35 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTqy9-006iwq-Op for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 20:07:11 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-2d6914a097cso140729457b3.10 for ; Mon, 14 Mar 2022 13:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:cc; bh=7WPeIutFQ8MpWvUoMJwXeeMUz9b7tskLEPBl/3D4C6U=; b=cxwJyz+g5A+OyqgvqDWvQe+JtpGKB6vHjvy5/DobHD8VmnHbQT7A8rTMSYElYviMzV W2Ps0EwVwxAvO4EXrcUP+dDEnYoUg3I3HrOiQ1Fegi6FffpY/SExycCPO8B9as25wbEs mwIMQpE2KLgaM4IFNmfC7KuV140gff8y5mz7qMpS/pLSxfK5wmgHsyGsDCF+j20zyA/M YFwqfQz2bm5J7nmGQAcJNNF9upClL6AnaCzH+kLXvABXiE8HErJNMACfTubNk6o3WD6n kf0Pwd1Kc522idPnHKae37N1MgRr0LwMpNAJ0ASvNDXcruiU4hGYsN5Aj6i1mx1VtsKw yZ7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:cc; bh=7WPeIutFQ8MpWvUoMJwXeeMUz9b7tskLEPBl/3D4C6U=; b=K1Y0bYsKBY+iNOP+CSUffLb4C3mP4sN/12gRIX2ZlFw8wjk6jFrM/gsJHMD9DyFfKE 85coR2Zt2afiCZH6PUSjbEBgC4nqVLeShl9txlABm0zqobkLgRDvu02CTwg2KzC0n5mj hq0SSEBTR4Q8m7lVrm0zcIOQJ9EVYeKH0NK0qpniup3saw9AnPBf6SfZJN4en4z6Hgny 8hzFZkyrGf+mCJKNxNI2fpnFUx9PzDQCWdD4YfwftdCAA/qmIDD2n/ZrEvSTQpC/ZYnk E8iY9DBhUVCfOG6QMrs30rkoWdf0QvfBC5nnc8Qxsj0kXumoLDNy5wwKorIjmi6hDsij R39A== X-Gm-Message-State: AOAM532di3Jngtg4WDfCnxOwF0riegDImA+1O/TxKaonLYJNIg4CJ4gJ GJhLLsnOsSDkfsokHpW5R+6n88l9f9K7/kC/Hg== X-Google-Smtp-Source: ABdhPJwqmuZWietxle5e91HveZ+teLadkWuBWcTKe8lzVoiXl7o144fZFzG4YZ53zF6KF//5yrRIAJR7dEQ1e0ntag== X-Received: from kaleshsingh.mtv.corp.google.com ([2620:15c:211:200:500a:9ac2:e73e:69e3]) (user=kaleshsingh job=sendgmr) by 2002:a25:2514:0:b0:62e:a211:a940 with SMTP id l20-20020a252514000000b0062ea211a940mr17232935ybl.122.1647288424162; Mon, 14 Mar 2022 13:07:04 -0700 (PDT) Date: Mon, 14 Mar 2022 13:01:17 -0700 In-Reply-To: <20220314200148.2695206-1-kaleshsingh@google.com> Message-Id: <20220314200148.2695206-9-kaleshsingh@google.com> Mime-Version: 1.0 References: <20220314200148.2695206-1-kaleshsingh@google.com> X-Mailer: git-send-email 2.35.1.723.g4982287a31-goog Subject: [PATCH v6 8/8] KVM: arm64: Symbolize the nVHE HYP backtrace From: Kalesh Singh Cc: will@kernel.org, maz@kernel.org, qperret@google.com, tabba@google.com, surenb@google.com, kernel-team@android.com, Kalesh Singh , James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Mark Rutland , Mark Brown , Masami Hiramatsu , Peter Collingbourne , "Madhavan T. Venkataraman" , Peter Zijlstra , Andrew Scull , Andrew Jones , Ard Biesheuvel , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_130705_864820_0CF3B101 X-CRM114-Status: GOOD ( 15.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Reintroduce the __kvm_nvhe_ symbols in kallsyms, ignoring the local symbols in this namespace. The local symbols are not informative and can cause aliasing issues when symbolizing the addresses. With the necessary symbols now in kallsyms we can symbolize nVHE stacktrace addresses using the %pB print format specifier. Example call trace: [ 98.916444][ T426] kvm [426]: nVHE hyp panic at: [] __kvm_nvhe_overflow_stack+0x8/0x34! [ 98.918360][ T426] nVHE HYP call trace: [ 98.918692][ T426] kvm [426]: [] __kvm_nvhe_cpu_prepare_nvhe_panic_info+0x4c/0x68 [ 98.919545][ T426] kvm [426]: [] __kvm_nvhe_hyp_panic+0x2c/0xe8 [ 98.920107][ T426] kvm [426]: [] __kvm_nvhe_hyp_panic_bad_stack+0x10/0x10 [ 98.920665][ T426] kvm [426]: [] __kvm_nvhe___kvm_hyp_host_vector+0x24c/0x794 [ 98.921292][ T426] kvm [426]: [] __kvm_nvhe_overflow_stack+0x24/0x34 . . . [ 98.973382][ T426] kvm [426]: [] __kvm_nvhe_overflow_stack+0x24/0x34 [ 98.973816][ T426] kvm [426]: [] __kvm_nvhe___kvm_vcpu_run+0x38/0x438 [ 98.974255][ T426] kvm [426]: [] __kvm_nvhe_handle___kvm_vcpu_run+0x1c4/0x364 [ 98.974719][ T426] kvm [426]: [] __kvm_nvhe_handle_trap+0xa8/0x130 [ 98.975152][ T426] kvm [426]: [] __kvm_nvhe___host_exit+0x64/0x64 [ 98.975588][ T426] ---- end of nVHE HYP call trace ---- Signed-off-by: Kalesh Singh Tested-by: Fuad Tabba Reviewed-by: Fuad Tabba --- Changes in v2: - Fix printk warnings - %p expects (void *) arch/arm64/kvm/handle_exit.c | 13 +++++-------- scripts/kallsyms.c | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index ff69dff33700..3a5c32017c6b 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -296,13 +296,8 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr, u64 elr_in_kimg = __phys_to_kimg(elr_phys); u64 hyp_offset = elr_in_kimg - kaslr_offset() - elr_virt; u64 mode = spsr & PSR_MODE_MASK; + u64 panic_addr = elr_virt + hyp_offset; - /* - * The nVHE hyp symbols are not included by kallsyms to avoid issues - * with aliasing. That means that the symbols cannot be printed with the - * "%pS" format specifier, so fall back to the vmlinux address if - * there's no better option. - */ if (mode != PSR_MODE_EL2t && mode != PSR_MODE_EL2h) { kvm_err("Invalid host exception to nVHE hyp!\n"); } else if (ESR_ELx_EC(esr) == ESR_ELx_EC_BRK64 && @@ -322,9 +317,11 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr, if (file) kvm_err("nVHE hyp BUG at: %s:%u!\n", file, line); else - kvm_err("nVHE hyp BUG at: %016llx!\n", elr_virt + hyp_offset); + kvm_err("nVHE hyp BUG at: [<%016llx>] %pB!\n", panic_addr, + (void *)panic_addr); } else { - kvm_err("nVHE hyp panic at: %016llx!\n", elr_virt + hyp_offset); + kvm_err("nVHE hyp panic at: [<%016llx>] %pB!\n", panic_addr, + (void *)panic_addr); } kvm_nvhe_dump_backtrace(hyp_offset); diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c index 54ad86d13784..19aba43d9da4 100644 --- a/scripts/kallsyms.c +++ b/scripts/kallsyms.c @@ -111,7 +111,7 @@ static bool is_ignored_symbol(const char *name, char type) ".LASANPC", /* s390 kasan local symbols */ "__crc_", /* modversions */ "__efistub_", /* arm64 EFI stub namespace */ - "__kvm_nvhe_", /* arm64 non-VHE KVM namespace */ + "__kvm_nvhe_$", /* arm64 local symbols in non-VHE KVM namespace */ "__AArch64ADRPThunk_", /* arm64 lld */ "__ARMV5PILongThunk_", /* arm lld */ "__ARMV7PILongThunk_",