From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93680C352A5 for ; Mon, 10 Feb 2020 13:35:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 623C020714 for ; Mon, 10 Feb 2020 13:35:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581341735; bh=hwOGVmsbivwG4ZlUq0ncinajvVwVSbIQ4zxqoO2OPXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=COINpuA+4w/ZUA44CqUP6ZuZ/IKaf8Q1y9h07wjUnPtVxgIYaDgXw+6yE+kN5SPDE Pv+1LKLa7r4HaBRmSLZ+Q1t3u79aCEhBoTmNKCS0NaRkK7RGstap7a/MsvVcpT4tbm Cj/GVRExDAwClyZqffPkdgSr1xbQzcVS52B33d4Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730285AbgBJNfe (ORCPT ); Mon, 10 Feb 2020 08:35:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:51476 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727852AbgBJMfT (ORCPT ); Mon, 10 Feb 2020 07:35:19 -0500 Received: from localhost (unknown [209.37.97.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6511B24676; Mon, 10 Feb 2020 12:35:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338119; bh=hwOGVmsbivwG4ZlUq0ncinajvVwVSbIQ4zxqoO2OPXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tHie922idPDKNegLTK/C9/3mEzGA/Voqzqdp/jqqrqUw2MDPghRDsT9ajut6J/O2Y Wr4YNART2wacCb/sr3KSBOK+tPhyW0jZeulT0ZBWnEBprbczA2e0t1Mev+8UIoFQR0 oMdDigoKz1XoLQFRKuLkZPXNNiDq/3cQA4+5bCzI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sukadev Bhattiprolu , Andrew Donnellan , Michael Ellerman Subject: [PATCH 4.19 054/195] powerpc/xmon: dont access ASDR in VMs Date: Mon, 10 Feb 2020 04:31:52 -0800 Message-Id: <20200210122311.302612035@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122305.731206734@linuxfoundation.org> References: <20200210122305.731206734@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sukadev Bhattiprolu commit c2a20711fc181e7f22ee5c16c28cb9578af84729 upstream. ASDR is HV-privileged and must only be accessed in HV-mode. Fixes a Program Check (0x700) when xmon in a VM dumps SPRs. Fixes: d1e1b351f50f ("powerpc/xmon: Add ISA v3.0 SPRs to SPR dump") Cc: stable@vger.kernel.org # v4.14+ Signed-off-by: Sukadev Bhattiprolu Reviewed-by: Andrew Donnellan Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20200107021633.GB29843@us.ibm.com Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/xmon/xmon.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -1878,15 +1878,14 @@ static void dump_300_sprs(void) printf("pidr = %.16lx tidr = %.16lx\n", mfspr(SPRN_PID), mfspr(SPRN_TIDR)); - printf("asdr = %.16lx psscr = %.16lx\n", - mfspr(SPRN_ASDR), hv ? mfspr(SPRN_PSSCR) - : mfspr(SPRN_PSSCR_PR)); + printf("psscr = %.16lx\n", + hv ? mfspr(SPRN_PSSCR) : mfspr(SPRN_PSSCR_PR)); if (!hv) return; - printf("ptcr = %.16lx\n", - mfspr(SPRN_PTCR)); + printf("ptcr = %.16lx asdr = %.16lx\n", + mfspr(SPRN_PTCR), mfspr(SPRN_ASDR)); #endif }