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 0C677C3DA79 for ; Mon, 15 Jan 2024 09:35:04 +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=74zgTdPptyTaaLld3LzOfQpeKzthAW2pftXzTU2LN10=; b=ENOTeHM9w4BUBK 9QJkX5YBPwrTmbSrZO5G1g7VxPCJVZLPEWp19PS/28imO2lROr1kB/J39NwEynw8LNqVjS7Nj0gZJ XhRFtthAgpIl0wkrJvlsvkSs3xDpYPUZ7XSTfYZMm5sQT+T4LL+d4/4eVeJPynLJbK83MN1rQ9ILZ u4MgZXExmQI8SqnFX84pdDSU5kY71Vej47Nwrs5ubQasth4Xe4/zpQyxh52+X5UeH/z3ql8XVrNso bbws8aDfJ3uKqssnHqwMUf0EEiWvbYs1N2OiKu6m+AT0ZNcrbfIg/Q/7e+TcObfDXF97UERFOVrG7 K25hMeuBJHmPGq0c2Asg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rPJMX-008RMU-2i; Mon, 15 Jan 2024 09:34:33 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rPJMV-008RLf-0X for linux-arm-kernel@lists.infradead.org; Mon, 15 Jan 2024 09:34:32 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 316782F4; Mon, 15 Jan 2024 01:35:14 -0800 (PST) Received: from [10.57.46.55] (unknown [10.57.46.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 58FCD3F6C4; Mon, 15 Jan 2024 01:34:26 -0800 (PST) Message-ID: <4e3c051b-ccdb-47d4-9a29-5c92f5101a06@arm.com> Date: Mon, 15 Jan 2024 09:34:24 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1] KVM: arm64: selftests: Handle feature fields with nonzero minimum value correctly Content-Language: en-GB To: Jing Zhang , KVM , KVMARM , ARMLinux , Marc Zyngier , Oliver Upton Cc: Paolo Bonzini , James Morse , Zenghui Yu , Itaru Kitayama References: <20240109165622.4104387-1-jingzhangos@google.com> From: Suzuki K Poulose In-Reply-To: <20240109165622.4104387-1-jingzhangos@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240115_013431_293463_7E7539DA X-CRM114-Status: GOOD ( 15.90 ) 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 On 09/01/2024 16:56, Jing Zhang wrote: > There are some feature fields with nonzero minimum valid value. Make > sure get_safe_value() won't return invalid field values for them. > Also fix a bug that wrongly uses the feature bits type as the feature > bits sign causing all fields as signed in the get_safe_value() and > get_invalid_value(). > > Fixes: 54a9ea73527d ("KVM: arm64: selftests: Test for setting ID register from usersapce") > Reported-by: Zenghui Yu > Reported-by: Itaru Kitayama > Signed-off-by: Jing Zhang > --- > .../selftests/kvm/aarch64/set_id_regs.c | 20 +++++++++++++++---- > 1 file changed, 16 insertions(+), 4 deletions(-) > > diff --git a/tools/testing/selftests/kvm/aarch64/set_id_regs.c b/tools/testing/selftests/kvm/aarch64/set_id_regs.c > index bac05210b539..f17454dc6d9e 100644 > --- a/tools/testing/selftests/kvm/aarch64/set_id_regs.c > +++ b/tools/testing/selftests/kvm/aarch64/set_id_regs.c > @@ -224,13 +224,20 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr) > { > uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0); > > - if (ftr_bits->type == FTR_UNSIGNED) { > + if (ftr_bits->sign == FTR_UNSIGNED) { > switch (ftr_bits->type) { > case FTR_EXACT: > ftr = ftr_bits->safe_val; > break; > case FTR_LOWER_SAFE: > - if (ftr > 0) > + uint64_t min_safe = 0; > + > + if (!strcmp(ftr_bits->name, "ID_AA64DFR0_EL1_DebugVer")) > + min_safe = ID_AA64DFR0_EL1_DebugVer_IMP; > + else if (!strcmp(ftr_bits->name, "ID_DFR0_EL1_CopDbg")) > + min_safe = ID_DFR0_EL1_CopDbg_Armv8; Instead of hardcoding the safe value here in the code, why not "fix" the safe value in the ftr_id table and use ftr_bits->safe_val for both the above cases ? > + > + if (ftr > min_safe) > ftr--; > break; > case FTR_HIGHER_SAFE: > @@ -252,7 +259,12 @@ uint64_t get_safe_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr) > ftr = ftr_bits->safe_val; > break; > case FTR_LOWER_SAFE: > - if (ftr > 0) > + uint64_t min_safe = 0; > + > + if (!strcmp(ftr_bits->name, "ID_DFR0_EL1_PerfMon")) > + min_safe = ID_DFR0_EL1_PerfMon_PMUv3; > + > + if (ftr > min_safe) > ftr--; Also, here, don't we need to type case both "ftr" and min_safe to int64_t for signed features ? Suzuki > break; > case FTR_HIGHER_SAFE: > @@ -276,7 +288,7 @@ uint64_t get_invalid_value(const struct reg_ftr_bits *ftr_bits, uint64_t ftr) > { > uint64_t ftr_max = GENMASK_ULL(ARM64_FEATURE_FIELD_BITS - 1, 0); > > - if (ftr_bits->type == FTR_UNSIGNED) { > + if (ftr_bits->sign == FTR_UNSIGNED) { > switch (ftr_bits->type) { > case FTR_EXACT: > ftr = max((uint64_t)ftr_bits->safe_val + 1, ftr + 1); > > base-commit: 0dd3ee31125508cd67f7e7172247f05b7fd1753a _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel