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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27EE8C433F5 for ; Thu, 6 Jan 2022 04:27:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232394AbiAFE1n (ORCPT ); Wed, 5 Jan 2022 23:27:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229847AbiAFE1n (ORCPT ); Wed, 5 Jan 2022 23:27:43 -0500 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0176CC061245 for ; Wed, 5 Jan 2022 20:27:43 -0800 (PST) Received: by mail-pg1-x54a.google.com with SMTP id t1-20020a6564c1000000b002e7f31cf59fso863387pgv.14 for ; Wed, 05 Jan 2022 20:27:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=p5OmhDUKTSdXgIVBJTRzlm/yO6iCAGZALwLyAA/W8/E=; b=ETqu3qwsfvkFjYpuDO4ArzyBdi/PRKWCriQwI382qxOnkbbd9z3XPiMlOEclkNJKZm 7/4ePGczV4KlaBOCJyYHbftf1yYtL9FSHSbQ6cxZqLmtBMioPAXHSJywhp4RKh7s6Qvc WvNP79elyyGxY+Dtt76C6bqta17smbd4EQN9ui0sPn9B31zpP/KOD64t1f2Mu04oYKT7 AfqlMO15P1HOzprKvQcYyVC6pNfNqvrXaeS+49hEosZM7l6vNUuzhg9xQk+JFVQB8sXg +JFq+jT/12jWiNvmOr/aTdu9m/t7ADYCGedNG1qeoLaNlmSKhhgYQzOVfusR5Pnv8dRG WmTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=p5OmhDUKTSdXgIVBJTRzlm/yO6iCAGZALwLyAA/W8/E=; b=uWLAK7omzsbRQPfIH34b1CanhRi6q8y3IbUzFt+C41shBpqF/v/7jnqZlojpyuB/7z sg4n53mTLqkKJYYgbTAWPAacEyI1G7CMHJ5fil1dUhBnLZ0barl3eBzBD8uU3ttoviEz GqZZuIHBjmQIkTYP2oDFEtTtW2MhUlVAp5XTNcI3zTtqaxIKCja3eACoMQAAobjLl1A3 2Z3q7tjiTU5p9C1YHGC8hA82lq6JrzFeonzBCFMs7XBDUz0UA2jCGmNJs4eZUnOjlumu yN3eyzLnf2ktEiSDTx5XX++PcaCDMRHbqvvkJLPC6pgH/Zcx3oPccBjorzutoPTvzrJw k+TQ== X-Gm-Message-State: AOAM533dzSC46gzrM2kFvG6jotdlQoN/WiVyGZzi22EoLh2intbYgkEY zo+sCmAaxV9bGfUXhdyLAG4qd5p4wO0= X-Google-Smtp-Source: ABdhPJwjEt0QYayHdlCuhfQf+mqyi1RRsLZUMQCWKjoXCx/27K4Tj8gHRYYYXEL6L5ruxJXGkIxmZyKIrNE= X-Received: from reiji-vws-sp.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3d59]) (user=reijiw job=sendgmr) by 2002:a17:902:dac9:b0:148:a2e7:fb1a with SMTP id q9-20020a170902dac900b00148a2e7fb1amr57612181plx.91.1641443262475; Wed, 05 Jan 2022 20:27:42 -0800 (PST) Date: Wed, 5 Jan 2022 20:26:42 -0800 Message-Id: <20220106042708.2869332-1-reijiw@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog Subject: [RFC PATCH v4 00/26] KVM: arm64: Make CPU ID registers writable by userspace From: Reiji Watanabe To: Marc Zyngier , kvmarm@lists.cs.columbia.edu Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, James Morse , Alexandru Elisei , Suzuki K Poulose , Paolo Bonzini , Will Deacon , Andrew Jones , Peng Liang , Peter Shier , Ricardo Koller , Oliver Upton , Jing Zhang , Raghavendra Rao Anata , Reiji Watanabe Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org In KVM/arm64, values of ID registers for a guest are mostly same as its host's values except for bits for feature that KVM doesn't support and for opt-in features that userspace didn't configure. Userspace can use KVM_SET_ONE_REG to a set ID register value, but it fails if userspace attempts to modify the register value. This patch series adds support to allow userspace to modify a value of ID registers (as long as KVM can support features that are indicated in the registers) so userspace can have more control of configuring and unconfiguring features for guests. We need this because we would like to expose a uniform set/level of features for a group of guests on systems with different ARM CPUs. Since some features are not binary in nature (e.g. AA64DFR0_EL1.BRPs fields indicate number of breakpoints minus 1), using KVM_ARM_VCPU_INIT to control such features is inconvenient. The patch series is for both VHE and non-VHE, except for protected VMs, which have a different way of configuring ID registers based on its different requirements [1]. There was a patch series that tried to achieve the same thing [2]. A few snippets of codes in this series were inspired by or came from [2]. The initial value of ID registers for a vCPU will be the host's value with bits cleared for unsupported features and for opt-in features that were not configured. So, the initial value userspace can see (via KVM_GET_ONE_REG) is the upper limit that can be set for the register. Any requests to change the value that conflicts with opt-in features' configuration will fail (e.g. if KVM_ARM_VCPU_PMU_V3 is configured by KVM_ARM_VCPU_INIT, ID_AA64DFR0_EL1.PMUVER cannot be set to zero. Otherwise, the initial value of ID_AA64DFR0_EL1.PMUVER will be zero, and cannot be changed from zero). When a guest tries to use a CPU feature that is not exposed to the guest, trapping it (to emulate a real CPU's behavior) would generally be a desirable behavior (when it is possible with no or little side effects). The later patches in the series add codes for this. Only features that can be trapped independently will be trapped by this series though. This series adds kunit tests for new functions in sys_regs.c (except for trivial ones), and these tests are enabled with a new configuration option 'CONFIG_KVM_KUNIT_TEST'. The series is based on v5.16-rc8 with the patch [3] applied. v4: - Make ID registers storage per VM instead of per vCPU. [Marc] - Implement arm64_check_features() in arch/arm64/kernel/cpufeature.c by using existing codes in the file. [Marc] - Use a configuration function to enable traps for disabled features. [Marc] - Document ID registers become immutable after the first KVM_RUN [Eric] - Update ID_AA64PFR0.GIC at the point where a GICv3 is created. [Marc] - Get TGranX's bit position by substracting 12 from TGranX_2's bit position. [Eric] - Don't validate AArch32 ID registers when the system doesn't support 32bit EL0. [Eric] - Add/fixes comments for patches. [Eric] - Made bug fixes/improvements of the selftest. [Eric] - Added .kunitconfig for arm64 KUnit tests v3: https://lore.kernel.org/all/20211117064359.2362060-1-reijiw@google.com/ - Remove ID register consistency checking across vCPUs. [Oliver] - Change KVM_CAP_ARM_ID_REG_WRITABLE to KVM_CAP_ARM_ID_REG_CONFIGURABLE. [Oliver] - Add KUnit testing for ID register validation and trap initialization. - Change read_id_reg() to take care of ID_AA64PFR0_EL1.GIC. - Add a helper of read_id_reg() (__read_id_reg()) and use the helper instead of directly using __vcpu_sys_reg(). - Change not to run kvm_id_regs_consistency_check() and kvm_vcpu_init_traps() for protected VMs. - Update selftest to remove test cases for ID register consistency. checking across vCPUs and to add test cases for ID_AA64PFR0_EL1.GIC. v2: https://lore.kernel.org/all/20211103062520.1445832-1-reijiw@google.com/ - Remove unnecessary line breaks. [Andrew] - Use @params for comments. [Andrew] - Move arm64_check_features to arch/arm64/kvm/sys_regs.c and change that KVM specific feature check function. [Andrew] - Remove unnecessary raz handling from __set_id_reg. [Andrew] - Remove sys_val field from the initial id_reg_info and add it in the later patch. [Andrew] - Call id_reg->init() from id_reg_info_init(). [Andrew] - Fix cpuid_feature_cap_perfmon_field() to convert 0xf to 0x0 (and use it in the following patches). - Change kvm_vcpu_first_run_init to set has_run_once to false when kvm_id_regs_consistency_check() fails. - Add a patch to introduce id_reg_info for ID_AA64MMFR0_EL1, which requires special validity checking for TGran*_2 fields. - Add patches to introduce id_reg_info for ID_DFR1_EL1 and ID_MMFR0_EL1, which are required due to arm64_check_features implementation change. - Add a new argument, which is a pointer to id_reg_info, for id_reg_info's validate(). v1: https://lore.kernel.org/all/20211012043535.500493-1-reijiw@google.com/ [1] https://lore.kernel.org/kvmarm/20211010145636.1950948-1-tabba@google.com/ [2] https://lore.kernel.org/kvm/20201102033422.657391-1-liangpeng10@huawei.com/ [3] https://lore.kernel.org/all/20220104194918.373612-2-rananta@google.com/ Reiji Watanabe (26): KVM: arm64: Introduce a validation function for an ID register KVM: arm64: Save ID registers' sanitized value per guest KVM: arm64: Introduce struct id_reg_info KVM: arm64: Make ID_AA64PFR0_EL1 writable KVM: arm64: Make ID_AA64PFR1_EL1 writable KVM: arm64: Make ID_AA64ISAR0_EL1 writable KVM: arm64: Make ID_AA64ISAR1_EL1 writable KVM: arm64: Make ID_AA64MMFR0_EL1 writable KVM: arm64: Hide IMPLEMENTATION DEFINED PMU support for the guest KVM: arm64: Make ID_AA64DFR0_EL1 writable KVM: arm64: Make ID_DFR0_EL1 writable KVM: arm64: Make MVFR1_EL1 writable KVM: arm64: Make ID registers without id_reg_info writable KVM: arm64: Add consistency checking for frac fields of ID registers KVM: arm64: Introduce KVM_CAP_ARM_ID_REG_CONFIGURABLE capability KVM: arm64: Add kunit test for ID register validation KVM: arm64: Use vcpu->arch cptr_el2 to track value of cptr_el2 for VHE KVM: arm64: Use vcpu->arch.mdcr_el2 to track value of mdcr_el2 KVM: arm64: Introduce framework to trap disabled features KVM: arm64: Trap disabled features of ID_AA64PFR0_EL1 KVM: arm64: Trap disabled features of ID_AA64PFR1_EL1 KVM: arm64: Trap disabled features of ID_AA64DFR0_EL1 KVM: arm64: Trap disabled features of ID_AA64MMFR1_EL1 KVM: arm64: Trap disabled features of ID_AA64ISAR1_EL1 KVM: arm64: Add kunit test for trap initialization KVM: arm64: selftests: Introduce id_reg_test Documentation/virt/kvm/api.rst | 12 + arch/arm64/include/asm/cpufeature.h | 3 +- arch/arm64/include/asm/kvm_arm.h | 32 + arch/arm64/include/asm/kvm_host.h | 19 + arch/arm64/include/asm/sysreg.h | 3 + arch/arm64/kernel/cpufeature.c | 228 +++ arch/arm64/kvm/.kunitconfig | 4 + arch/arm64/kvm/Kconfig | 11 + arch/arm64/kvm/arm.c | 24 +- arch/arm64/kvm/debug.c | 13 +- arch/arm64/kvm/hyp/vhe/switch.c | 14 +- arch/arm64/kvm/sys_regs.c | 1329 +++++++++++++++-- arch/arm64/kvm/sys_regs_test.c | 1247 ++++++++++++++++ arch/arm64/kvm/vgic/vgic-init.c | 5 + include/uapi/linux/kvm.h | 1 + tools/arch/arm64/include/asm/sysreg.h | 1 + tools/testing/selftests/kvm/.gitignore | 1 + tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/aarch64/id_reg_test.c | 1239 +++++++++++++++ 19 files changed, 4041 insertions(+), 146 deletions(-) create mode 100644 arch/arm64/kvm/.kunitconfig create mode 100644 arch/arm64/kvm/sys_regs_test.c create mode 100644 tools/testing/selftests/kvm/aarch64/id_reg_test.c base-commit: d399b107ee49bf5ea0391bd7614d512809e927b0 -- 2.34.1.448.ga2b2bfdf31-goog