From patchwork Fri Aug 27 10:16:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 12461863 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=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham 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 C39E9C4320A for ; Fri, 27 Aug 2021 10:19:30 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9595160FDC for ; Fri, 27 Aug 2021 10:19:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9595160FDC Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=hl/dbinqz9BE6tu7saTUWYO7elHRCbNRLyXxHc1eoQo=; b=sBSNwmK+dolpCFqcak7EuHtHrs 92kX+0enm2ltXhk2sRhNvMZJyBsIzO+DO3gPJ7dJoV5k3+92gopMpu1Wji2ERC6Hcjkj7c5jg9UBk TAAXTgmQJ1G5X4SS3U5/gRb8zU5ASIB9nZWFwXdBJrgCEkvKuZR076rwCvElVXNWfajgizVWwQrIl VyzVm6deG0tB6okvmT7HAYNGVPzSFWsxkibxfeBNWYOAL9MeDBHMVY6mgsCbBSyBKyNjHCl8Nf1EF kBDi1Z9LYnc3w7uiRCcfR/k+pVXNlyZWFRReK4NVp9o2ewYrHgKtGPv/1x4ry7qqYEVk4+4i7JFFF /6NJrN0A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mJYvY-00CEE8-AA; Fri, 27 Aug 2021 10:17:36 +0000 Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mJYuQ-00CDzw-Kd for linux-arm-kernel@lists.infradead.org; Fri, 27 Aug 2021 10:16:27 +0000 Received: by mail-wr1-x44a.google.com with SMTP id r11-20020a5d4e4b000000b001575c5ed4b4so1715173wrt.4 for ; Fri, 27 Aug 2021 03:16:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=SsrZd6Jo8kMJWJSsMSYjDPdCpx5Fc9MexzuaW/MoFqQ=; b=BZjdr5KZHMgOcU8VqWpDgH7zY3wkoT523uqqlrhERo+iSn3xJNI7QA99yOuh3YPeJp FyQtyRATL2t1bNZHbVQkHh7wLDV5ccKYZOvazhTUhoy3xlvN3VaVDht8M5E6THT4hM3X E5jVaQSFz2QDvtZSibkFM6iDf1WrkKx0RhVXWkaoEEWTEEdaYbZm28tYkUwmaw42TDaN bw9MFKL/VF1tMSMZ+oqhfAOEDeTl7WkJUiq1aIoSt1dKRy8L4q/3q4UEDahyjFGKcvfM Q1R/qu1ncxIqZRBrq7wurO71aHVhbrQcZpEX4W3A/UaczTEfOaLhqqIscKCgI8sO1Fi+ 4Y7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=SsrZd6Jo8kMJWJSsMSYjDPdCpx5Fc9MexzuaW/MoFqQ=; b=XyZohYAfFErgYOywM26Tyel4dadWEXNxaaPPCxYOXZZAptcUz4Uyt8clLZsDrAzfg3 S8iVQmr60o+ESeG+XXSqAEOkPEIKLJdULPHQHuBDKD3WLFhC10GCv5hrOUOzRa273rOO vdybvLffxQ2JYNlsbnJD6ePje/BXhq3tDSH/4nhmsScOiruVeGvbID5Dl2+EttmnF/NA 1grLbdG3EQzkqT7IR732xXzWkArKaVSr4VLOGq0OppIF+g47oNEDuT2TnxhHFD2RaDlp wmpAdFD7KHNEFKfXQB0XT1jxJL51g9rplvwSDYZ4ktRKaWH3MmCE4cMZ86r6id5qshoo nWJw== X-Gm-Message-State: AOAM533YYVlOecId6llGgJpThpMLBIx6KAA56GrkFNgkE+Wy9JYbryIe jw54/FQldjOz9RxSTU+fnuCnspLgyw== X-Google-Smtp-Source: ABdhPJztEz1988L0qtSVWiS7gD05LAwEOXiOtb7SpQw0H3ZxaU+gyIMNUefXyCTKQspH2GaRYyM9Slru3w== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a1c:98d2:: with SMTP id a201mr8090262wme.89.1630059384567; Fri, 27 Aug 2021 03:16:24 -0700 (PDT) Date: Fri, 27 Aug 2021 11:16:07 +0100 In-Reply-To: <20210827101609.2808181-1-tabba@google.com> Message-Id: <20210827101609.2808181-7-tabba@google.com> Mime-Version: 1.0 References: <20210827101609.2808181-1-tabba@google.com> X-Mailer: git-send-email 2.33.0.259.gc128427fd7-goog Subject: [PATCH v5 6/8] KVM: arm64: Move sanitized copies of CPU features From: Fuad Tabba To: kvmarm@lists.cs.columbia.edu Cc: maz@kernel.org, will@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, mark.rutland@arm.com, christoffer.dall@arm.com, pbonzini@redhat.com, drjones@redhat.com, oupton@google.com, qperret@google.com, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel-team@android.com, tabba@google.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210827_031626_723673_755ACE0F X-CRM114-Status: GOOD ( 11.80 ) 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 Move the sanitized copies of the CPU feature registers to the recently created sys_regs.c. This consolidates all copies in a more relevant file. No functional change intended. Acked-by: Will Deacon Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 6 ------ arch/arm64/kvm/hyp/nvhe/sys_regs.c | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index 2a07d63b8498..f6d96e60b323 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -25,12 +25,6 @@ struct host_kvm host_kvm; static struct hyp_pool host_s2_pool; -/* - * Copies of the host's CPU features registers holding sanitized values. - */ -u64 id_aa64mmfr0_el1_sys_val; -u64 id_aa64mmfr1_el1_sys_val; - const u8 pkvm_hyp_id = 1; static void *host_s2_zalloc_pages_exact(size_t size) diff --git a/arch/arm64/kvm/hyp/nvhe/sys_regs.c b/arch/arm64/kvm/hyp/nvhe/sys_regs.c index a7e836537154..4a9868ec1f0f 100644 --- a/arch/arm64/kvm/hyp/nvhe/sys_regs.c +++ b/arch/arm64/kvm/hyp/nvhe/sys_regs.c @@ -23,6 +23,8 @@ u64 id_aa64pfr0_el1_sys_val; u64 id_aa64pfr1_el1_sys_val; u64 id_aa64isar0_el1_sys_val; u64 id_aa64isar1_el1_sys_val; +u64 id_aa64mmfr0_el1_sys_val; +u64 id_aa64mmfr1_el1_sys_val; u64 id_aa64mmfr2_el1_sys_val; static inline void inject_undef(struct kvm_vcpu *vcpu)