From patchwork Mon Nov 2 19:16:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 11875081 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=-7.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=no 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 AB680C388F9 for ; Mon, 2 Nov 2020 19:16:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5563A223FD for ; Mon, 2 Nov 2020 19:16:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604344578; bh=KaBxJjv3YFcRADE2Fb61WsHODS72mdq+Zd3tO6gwFuY=; h=From:To:Cc:Subject:Date:List-ID:From; b=1uZOo/W4sFztJoSCn7dPvGl7wy0Ci7Zn5U8Z/BLxYQ7cGgSET7S10kxaJEvQkj3NP jm+e6duw65ZYj/qp2qX38i/lOQLENFbntHcTs3cA+LWRYLZ0nbJKh/0vcTH7dN2Nkk LXiUW/C4lofIzbpDlsWQZvWmhjE2LRTwrjM0P2JA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726429AbgKBTQR (ORCPT ); Mon, 2 Nov 2020 14:16:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:60354 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725929AbgKBTQR (ORCPT ); Mon, 2 Nov 2020 14:16:17 -0500 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (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 8853422280; Mon, 2 Nov 2020 19:16:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604344576; bh=KaBxJjv3YFcRADE2Fb61WsHODS72mdq+Zd3tO6gwFuY=; h=From:To:Cc:Subject:Date:From; b=F6G5LI7TVR4qwUpzdpSGCqSMwzpczvA+k2UyTbrKWn/WcKbBt3sCELDKAvVuQ32bD lFE/wIiB6Y9eKt3htBkEB+ex7jCuzDzQOSsupiyzo5K0Rghgg9vjcFbZ8dxmrp1+bK EQ8wn9YHhNsPfSWHoe8SvEUfyiEKrMWo0bAq9I5Y= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1kZfJN-006nxn-6F; Mon, 02 Nov 2020 19:16:13 +0000 From: Marc Zyngier To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Cc: James Morse , Julien Thierry , Suzuki K Poulose , kernel-team@android.com Subject: [PATCH 0/8] KVM: arm64: Kill the copro array Date: Mon, 2 Nov 2020 19:16:01 +0000 Message-Id: <20201102191609.265711-1-maz@kernel.org> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Since the very beginning of KVM/arm64, we represented the system register file using a dual view: on one side the AArch64 state, on the other a bizarre mapping of the AArch64 state onto the Aarch64 registers. It was nice at the time as it allowed us to share some code with the 32bit port, and to come up with some creative bugs. But is was always a hack, and we are now in a position to simplify the whole thing. This series goes through the whole of the AArch32 cp14/15 register file, and point each of them directly at their 64bit equivalent. For the few cases where two 32bit registers share a 64bit counterpart, we define which half of the register they map. Finally, we drop a large number of definitions and state that have become useless. This series applies on top of the exception injection rework previously posted [1]. M. [1] https://lore.kernel.org/r/20201102164045.264512-1-maz@kernel.org Marc Zyngier (8): KVM: arm64: Move AArch32 exceptions over to AArch64 sysregs KVM: arm64: Add AArch32 mapping annotation KVM: arm64: Map AArch32 cp15 register to AArch64 sysregs KVM: arm64: Map AArch32 cp14 register to AArch64 sysregs KVM: arm64: Drop is_32bit trap attribute KVM: arm64: Drop is_aarch32 trap attribute KVM: arm64: Drop legacy copro shadow register KVM: arm64: Drop kvm_coproc.h arch/arm64/include/asm/kvm_coproc.h | 38 ----- arch/arm64/include/asm/kvm_host.h | 73 +++------ arch/arm64/kvm/arm.c | 3 +- arch/arm64/kvm/guest.c | 1 - arch/arm64/kvm/handle_exit.c | 1 - arch/arm64/kvm/inject_fault.c | 62 +++----- arch/arm64/kvm/reset.c | 1 - arch/arm64/kvm/sys_regs.c | 231 ++++++++++++---------------- arch/arm64/kvm/sys_regs.h | 9 +- arch/arm64/kvm/vgic-sys-reg-v3.c | 4 - 10 files changed, 146 insertions(+), 277 deletions(-) delete mode 100644 arch/arm64/include/asm/kvm_coproc.h