From patchwork Sun Mar 26 01:19:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jing Zhang X-Patchwork-Id: 13187958 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 33736C761AF for ; Sun, 26 Mar 2023 01:21:09 +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:To:From:Subject:Message-ID: References:Mime-Version: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=ED19Ort96Bwplq34+oOJ6gaVBfSRu1O/OOf7unnshFQ=; b=2lX0Nqv+Id+fW6D+UV4gDIx4K8 JEPFM7IzYrKDdviuxnudqsrCFN0MtgkpPm6CkvugrP1EqVP18Qkt50c32AIIhoO8fOyYu1LwWZUA4 aF/TM6ZVTlJuhEt/JzneoWM4Zz6hu9Uf30g1i3rdhz3xvniP/pHCIko0wqihIehzOVhcXEr9mrCoB DhvUIkQhbi8V6nxxAXXANmNi2WCCPPtwTibDKz5RpmXKAjR8BTd5sV4Jfw4PNXyciQaYlXoh9cLF/ 4Dk0mZxctXc/PN+xxRfHXdo7uBoHbS0oKDMaSLzFS6C9M49kuFaCD6hZQB7CiNQXz5lS0drPB7pzZ AyCbSJng==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pgF3H-007lVJ-26; Sun, 26 Mar 2023 01:20:07 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pgF37-007lSO-25 for linux-arm-kernel@lists.infradead.org; Sun, 26 Mar 2023 01:19:58 +0000 Received: by mail-yb1-xb49.google.com with SMTP id w5-20020a253005000000b00aedd4305ff2so5321498ybw.13 for ; Sat, 25 Mar 2023 18:19:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1679793596; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=a1CzuRLzajO5nAP1hv6J1qOtlciV+j70IY9I3nmlEKs=; b=V4R4aNUZdOj8e+zq2t67IQd74cvL7qKsnXzaFVNMRiCBV68q4lKbKBe+tDtYxSlyUD gcL3G0ty4QGoU+io8QvDzhV9r2eEF9pnC84GQZAqojcLjpmUDjip/oj6qNAMj03D+u9E DHECVaPKZJTZ4zrYcPvpBDb5X45BxLr+vhqxOwpBdW8venbuRmwSTvGzW50neo4UqjQE sFVY+6imDq8+LkSv0thegzxwdzY+Md73ySuY6Kt7p27zCqqXX6XGiLRxfutKMw6PkNN/ BaHddqxEUd6N4/W1kxh753D3H4as0R18+OP52W4yM1Eywm6NDvhiemn2zygWXoT7vlth QOFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679793596; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=a1CzuRLzajO5nAP1hv6J1qOtlciV+j70IY9I3nmlEKs=; b=KlVB1cxBxEItH9/IAddTobnA3PtLf1uDkdJ0czRZXxUvdLyh3O/ESmTwfMQs2e994o NbUWAXqRv3zP1ObBCJOfdPrKTEo0T4Kt7q1TObAIDOg7yvg/g6f+ROeOKm75v5ZGKryJ 6WsCPSkE+3n52D2QPz//WeB++rWC9Rh9mh+T/cPeFYvD0Z1SWdt2JPBe8mdwQcJudd7G Tp4kNIec9WXrEA034mwvD4gGuUkHISfmQ2Q0NA1TRv14KsCDW8WTqTFi8sen/4fvyaOl o6qZ7uS87CKC8Q7Ua044MsPyn8HNE7Z88J/C23OzJt98AtFOc9Q+P/JBqHXvmZDjLrc3 Ymvg== X-Gm-Message-State: AAQBX9fPjBh1R6EK1IbPXPM3T0I/+iXVXSdCgvnXlvjXHmGM3WmD0W4E nR8jayJaeKorIPKkoiffyX6AsFeGn6xS6eVEwQ== X-Google-Smtp-Source: AKy350YH+y1b+mbI36VPG5J8rICwEplkCoAuYpdy1UPWDxxU1AKvzeIhGBxGH7chIyIqq4l8Xk90ZzQpMLeK5XatWA== X-Received: from jgzg.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1acf]) (user=jingzhangos job=sendgmr) by 2002:a05:6902:1586:b0:b68:7b14:186b with SMTP id k6-20020a056902158600b00b687b14186bmr3114221ybu.1.1679793595845; Sat, 25 Mar 2023 18:19:55 -0700 (PDT) Date: Sun, 26 Mar 2023 01:19:48 +0000 In-Reply-To: <20230326011950.405749-1-jingzhangos@google.com> Mime-Version: 1.0 References: <20230326011950.405749-1-jingzhangos@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Message-ID: <20230326011950.405749-2-jingzhangos@google.com> Subject: [PATCH v1 1/3] KVM: arm64: Enable writable for BRPs and CTX_CMPs for ID_AA64DFR0_EL1 From: Jing Zhang To: KVM , KVMARM , ARMLinux , Marc Zyngier , Oliver Upton Cc: Will Deacon , Paolo Bonzini , James Morse , Alexandru Elisei , Suzuki K Poulose , Fuad Tabba , Reiji Watanabe , Ricardo Koller , Raghavendra Rao Ananta , Jing Zhang X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230325_181957_684655_38BA6EEB X-CRM114-Status: GOOD ( 11.02 ) 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 Since number of context-aware breakpoints must be no more than number of supported breakpoints according to Arm ARM, return an error if userspace tries to set CTX_CMPS field to such value. Signed-off-by: Jing Zhang --- arch/arm64/kvm/id_regs.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/id_regs.c b/arch/arm64/kvm/id_regs.c index 726b810b6e06..64691273980b 100644 --- a/arch/arm64/kvm/id_regs.c +++ b/arch/arm64/kvm/id_regs.c @@ -362,10 +362,15 @@ static int set_id_aa64dfr0_el1(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd, u64 val) { - u8 pmuver, host_pmuver; + u8 pmuver, host_pmuver, brps, ctx_cmps; bool valid_pmu; int ret; + brps = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_BRPs), val); + ctx_cmps = FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_CTX_CMPs), val); + if (ctx_cmps > brps) + return -EINVAL; + host_pmuver = kvm_arm_pmu_get_pmuver_limit(); /* @@ -623,6 +628,10 @@ static struct id_reg_desc id_reg_descs[KVM_ARM_ID_REG_NUM] = { .ftr_bits = { ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64DFR0_EL1_PMUVer_SHIFT, ID_AA64DFR0_EL1_PMUVer_WIDTH, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, + ID_AA64DFR0_EL1_BRPs_SHIFT, ID_AA64DFR0_EL1_BRPs_WIDTH, 0), + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, + ID_AA64DFR0_EL1_CTX_CMPs_SHIFT, ID_AA64DFR0_EL1_CTX_CMPs_WIDTH, 0), ARM64_FTR_END, }, .init = init_id_aa64dfr0_el1, },