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 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 42C94EE4996 for ; Tue, 22 Aug 2023 10:06:27 +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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tmbOq4PiYr3238C4qi+kwDrLmLJJp9xY0Wv+tNbYD4A=; b=txGL70f5ASwMyW NZaEt8ogfEMXwsG0FwTKWD/+ntE0l4fLhATbS1xGna2gPk/5UttSu5g1NGQyH++7hELgpDKxZgVg1 1HH6bJ37SfTM95niAVKJejgrddk63K3pNgt8gw0/6XXUs9j9hfdFbgSGr12cWAHAp1ZQSkjoVV6mZ pa0hvbd1xJYWRVVuK4YdEMTTT0UvU/U7x+yvZN5xZjX1M8OKrqyPb3cvWU4qrzRcVuZqrV4PDx4Gw hRMnLwlRSq9DjAtgKRjkpxbNhNFf/Iqie4pRgtRCiUotQwT20EkRsPnMdkAHHzLZNWOQk3tOyw1PI /YqJPE9f7NaSDTcVTZlw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qYOGv-00FbAU-1s; Tue, 22 Aug 2023 10:06:01 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qYOGs-00FbA6-20 for linux-arm-kernel@lists.infradead.org; Tue, 22 Aug 2023 10:06:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692698757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ljh8mgcq2yx3L1h9FQGeznUQ1rxHUXwLkH1HroGp6xY=; b=NSohfqO7ttx3XK53sFCGHYT/SP9KeAFN91BCLQDBMLhKggSggcvM3JUTx9kDE8A391S6dD slKQXHPkbLX/wYhqAS6IkHlPR8UWRT5pRlf6SaTRfNonkyDg3V6k6ir3G93efBABqNYI/6 6vn08S2N7uTQAXt/gVaDJdP1apZUCjM= Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-533-CrFwBdhyN_GBlgQyrnfxvg-1; Tue, 22 Aug 2023 06:05:56 -0400 X-MC-Unique: CrFwBdhyN_GBlgQyrnfxvg-1 Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-1c06de43310so3385845ad.1 for ; Tue, 22 Aug 2023 03:05:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692698754; x=1693303554; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ljh8mgcq2yx3L1h9FQGeznUQ1rxHUXwLkH1HroGp6xY=; b=btX15cYmu/iOKbmYTjqg2b6xBG1j1+G629rtRwFXPPakM3FhXpetS12lBZOiD1IIEL b0iNBqRiGm+FNCkdkxgTuX+6q1jnMvT1dFhmOYub9dsZkwXwbOd69ToKzz6MKyMYx78n vG8t7ip1QSG/2i595N2fbVVfUiy7DWNDpQSoUwQ4s8WmtXrzqDSQcd8mIfJFnCZNi4xS XoUgzHlO0JFYJzJQTo8lNznxk0O00X97YZBZgY2HM7mQQwNxv/77lYY3N1VfHMKvHd7G yPI+uN0DecyFUjQoikI9owckpJhFKOLVtSkXJhmS5FGf4eoAoYImHJ6VvkdCrxgs2RjP 0xeg== X-Gm-Message-State: AOJu0YzkpS/RUw5iAhsdH9Y/pbb33HQxQUyi+UlyR6ThfWlQd987aQJl u4HtXENFX9tw4KFzQUBbqXbShREo4txphdqvq8VmiDowAvD4aYpxTIovwnHN7op81i7axH8YGfl qEtgG/G7wYPt7txbfqTBxipGixoC3wcf6mek= X-Received: by 2002:a17:902:cecc:b0:1b3:ec39:f42c with SMTP id d12-20020a170902cecc00b001b3ec39f42cmr10623707plg.5.1692698754302; Tue, 22 Aug 2023 03:05:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEBhn68XouwWIaKc08runbGqmfjkKyK5I3i4ktoUZ68HemKWF8GXSCA5juwTjuCj2HbOAuLAA== X-Received: by 2002:a17:902:cecc:b0:1b3:ec39:f42c with SMTP id d12-20020a170902cecc00b001b3ec39f42cmr10623682plg.5.1692698753973; Tue, 22 Aug 2023 03:05:53 -0700 (PDT) Received: from [10.72.112.73] ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id q4-20020a170902bd8400b001b9f032bb3dsm8603671pls.3.2023.08.22.03.05.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 22 Aug 2023 03:05:52 -0700 (PDT) Message-ID: <1c6c07af-f6d0-89a6-1b7d-164ca100ac88@redhat.com> Date: Tue, 22 Aug 2023 18:05:47 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH v5 08/12] KVM: arm64: PMU: Allow userspace to limit PMCR_EL0.N for the guest To: Raghavendra Rao Ananta , Oliver Upton , Marc Zyngier Cc: Alexandru Elisei , James Morse , Suzuki K Poulose , Paolo Bonzini , Zenghui Yu , Jing Zhang , Reiji Watanabe , Colton Lewis , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kvm@vger.kernel.org References: <20230817003029.3073210-1-rananta@google.com> <20230817003029.3073210-9-rananta@google.com> From: Shaoqin Huang In-Reply-To: <20230817003029.3073210-9-rananta@google.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230822_030558_752103_53C5739D X-CRM114-Status: GOOD ( 36.67 ) 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: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Raghavendra, On 8/17/23 08:30, Raghavendra Rao Ananta wrote: > From: Reiji Watanabe > > KVM does not yet support userspace modifying PMCR_EL0.N (With > the previous patch, KVM ignores what is written by upserspace). > Add support userspace limiting PMCR_EL0.N. > > Disallow userspace to set PMCR_EL0.N to a value that is greater > than the host value (KVM_SET_ONE_REG will fail), as KVM doesn't > support more event counters than the host HW implements. > Although this is an ABI change, this change only affects > userspace setting PMCR_EL0.N to a larger value than the host. > As accesses to unadvertised event counters indices is CONSTRAINED > UNPREDICTABLE behavior, and PMCR_EL0.N was reset to the host value > on every vCPU reset before this series, I can't think of any > use case where a user space would do that. > > Also, ignore writes to read-only bits that are cleared on vCPU reset, > and RES{0,1} bits (including writable bits that KVM doesn't support > yet), as those bits shouldn't be modified (at least with > the current KVM). > > Signed-off-by: Reiji Watanabe > Signed-off-by: Raghavendra Rao Ananta > --- > arch/arm64/include/asm/kvm_host.h | 3 ++ > arch/arm64/kvm/pmu-emul.c | 1 + > arch/arm64/kvm/sys_regs.c | 49 +++++++++++++++++++++++++++++-- > 3 files changed, 51 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 0f2dbbe8f6a7e..c15ec365283d1 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -259,6 +259,9 @@ struct kvm_arch { > /* PMCR_EL0.N value for the guest */ > u8 pmcr_n; > > + /* Limit value of PMCR_EL0.N for the guest */ > + u8 pmcr_n_limit; > + > /* Hypercall features firmware registers' descriptor */ > struct kvm_smccc_features smccc_feat; > struct maple_tree smccc_filter; > diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c > index ce7de6bbdc967..39ad56a71ad20 100644 > --- a/arch/arm64/kvm/pmu-emul.c > +++ b/arch/arm64/kvm/pmu-emul.c > @@ -896,6 +896,7 @@ int kvm_arm_set_vm_pmu(struct kvm *kvm, struct arm_pmu *arm_pmu) > * while the latter does not. > */ > kvm->arch.pmcr_n = arm_pmu->num_events - 1; > + kvm->arch.pmcr_n_limit = arm_pmu->num_events - 1; > > return 0; > } > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index 2075901356c5b..c01d62afa7db4 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -1086,6 +1086,51 @@ static int get_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r, > return 0; > } > > +static int set_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r, > + u64 val) > +{ > + struct kvm *kvm = vcpu->kvm; > + u64 new_n, mutable_mask; > + int ret = 0; > + > + new_n = FIELD_GET(ARMV8_PMU_PMCR_N, val); > + > + mutex_lock(&kvm->arch.config_lock); > + if (unlikely(new_n != kvm->arch.pmcr_n)) { > + /* > + * The vCPU can't have more counters than the PMU > + * hardware implements. > + */ > + if (new_n <= kvm->arch.pmcr_n_limit) > + kvm->arch.pmcr_n = new_n; > + else > + ret = -EINVAL; > + } > + mutex_unlock(&kvm->arch.config_lock); Another thing I am just wonder is that should we block any modification to the pmcr_n after vm start to run? Like add one more checking kvm_vm_has_ran_once() at the beginning of the set_pmcr() function. Thanks, Shaoqin > + if (ret) > + return ret; > + > + /* > + * Ignore writes to RES0 bits, read only bits that are cleared on > + * vCPU reset, and writable bits that KVM doesn't support yet. > + * (i.e. only PMCR.N and bits [7:0] are mutable from userspace) > + * The LP bit is RES0 when FEAT_PMUv3p5 is not supported on the vCPU. > + * But, we leave the bit as it is here, as the vCPU's PMUver might > + * be changed later (NOTE: the bit will be cleared on first vCPU run > + * if necessary). > + */ > + mutable_mask = (ARMV8_PMU_PMCR_MASK | ARMV8_PMU_PMCR_N); > + val &= mutable_mask; > + val |= (__vcpu_sys_reg(vcpu, r->reg) & ~mutable_mask); > + > + /* The LC bit is RES1 when AArch32 is not supported */ > + if (!kvm_supports_32bit_el0()) > + val |= ARMV8_PMU_PMCR_LC; > + > + __vcpu_sys_reg(vcpu, r->reg) = val; > + return 0; > +} > + > /* Silly macro to expand the DBG{BCR,BVR,WVR,WCR}n_EL1 registers in one go */ > #define DBG_BCR_BVR_WCR_WVR_EL1(n) \ > { SYS_DESC(SYS_DBGBVRn_EL1(n)), \ > @@ -2147,8 +2192,8 @@ static const struct sys_reg_desc sys_reg_descs[] = { > { SYS_DESC(SYS_CTR_EL0), access_ctr }, > { SYS_DESC(SYS_SVCR), undef_access }, > > - { PMU_SYS_REG(PMCR_EL0), .access = access_pmcr, > - .reset = reset_pmcr, .reg = PMCR_EL0, .get_user = get_pmcr }, > + { PMU_SYS_REG(PMCR_EL0), .access = access_pmcr, .reset = reset_pmcr, > + .reg = PMCR_EL0, .get_user = get_pmcr, .set_user = set_pmcr }, > { PMU_SYS_REG(PMCNTENSET_EL0), > .access = access_pmcnten, .reg = PMCNTENSET_EL0 }, > { PMU_SYS_REG(PMCNTENCLR_EL0), -- Shaoqin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel