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 A6DA8C3DA79 for ; Mon, 15 Jan 2024 23:08:19 +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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/VaABJcBihXCcDUU8e0AisBXrWCmLvYwvHTM8mnp6ug=; b=JiUG/6JK7KUsc9 Df2vFr6vKZXhGG2j2MQhVnN5tS3xDbKdNexb1N82OY4TdCa+gCIBesWFRk4HaH8Qb9POs56kfon1h sgzNN4reMcATWTWHXE/bMG08uAbuAqYI5NNA0FsJngBFEaEejdkWFIY+MHC5GvxtGztuCzWWaXFGm Wn60js/cW+qTV5ng1DvfcNoql85qjevY4z3qVS2JUjvUG58hFG1ylWZyrguzJqpAp97Y5dZckxZ2K ltPR8daEAp8H9mCq5FVrjD2yfGpZkK5x1pb/fqnCwUCwyCUML6kW0f1f7LuUeq4WitUC4CScWnYMT wbjgeGpRjwLVSjOPGogw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rPW3N-00AKaz-36; Mon, 15 Jan 2024 23:07:37 +0000 Received: from out-184.mta1.migadu.com ([2001:41d0:203:375::b8]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rPW3J-00AKaW-2a for linux-arm-kernel@lists.infradead.org; Mon, 15 Jan 2024 23:07:35 +0000 Date: Tue, 16 Jan 2024 08:07:18 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1705360047; 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: in-reply-to:in-reply-to:references:references; bh=BkFq3LEv+V+5jZZwFAZjydWZ/AIL0WUeLSmrK+uOJi0=; b=ZUai/ujkNJpzji/mDPuh90wC+DpN1Hzcyah1T04PaWoh+ix3VtC6AsatEM2IUd22Am88av teBCpb1xa3C+kyQ0XuWv2Rak+Ig/2GcN4GBYHiZAWihoqTpF0/vldOdVOgo7jHXmXIV2jY GEnaxPcbIE4NQa4KJ/YhJ3I+jWCS00U= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Itaru Kitayama To: Jing Zhang Cc: KVM , KVMARM , ARMLinux , Marc Zyngier , Oliver Upton , Paolo Bonzini , James Morse , Suzuki K Poulose , Zenghui Yu , Itaru Kitayama Subject: Re: [PATCH v2] KVM: arm64: selftests: Handle feature fields with nonzero minimum value correctly Message-ID: References: <20240115220210.3966064-1-jingzhangos@google.com> <20240115220210.3966064-2-jingzhangos@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240115220210.3966064-2-jingzhangos@google.com> X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240115_150734_395544_AC74C7CC X-CRM114-Status: GOOD ( 19.23 ) 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Jan 15, 2024 at 02:02:09PM -0800, 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 > Tested-by: Itaru Kitayama > Signed-off-by: Jing Zhang v2 works on FVP. Tested-by: Itaru Kitayama Thanks, Itaru. > > --- > * v1 -> v2: > - Use ftr_bits->safe_val for minimal safe value for type FTR_LOWER_SAFE. > - Fix build error reported by Zenghui with gcc-10.3.1. > --- > .../selftests/kvm/aarch64/set_id_regs.c | 18 +++++++++++------- > 1 file changed, 11 insertions(+), 7 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..16e2338686c1 100644 > --- a/tools/testing/selftests/kvm/aarch64/set_id_regs.c > +++ b/tools/testing/selftests/kvm/aarch64/set_id_regs.c > @@ -32,6 +32,10 @@ struct reg_ftr_bits { > enum ftr_type type; > uint8_t shift; > uint64_t mask; > + /* > + * For FTR_EXACT, safe_val is used as the exact safe value. > + * For FTR_LOWER_SAFE, safe_val is used as the minimal safe value. > + */ > int64_t safe_val; > }; > > @@ -65,13 +69,13 @@ struct test_feature_reg { > > static const struct reg_ftr_bits ftr_id_aa64dfr0_el1[] = { > S_REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64DFR0_EL1, PMUVer, 0), > - REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64DFR0_EL1, DebugVer, 0), > + REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64DFR0_EL1, DebugVer, ID_AA64DFR0_EL1_DebugVer_IMP), > REG_FTR_END, > }; > > static const struct reg_ftr_bits ftr_id_dfr0_el1[] = { > - S_REG_FTR_BITS(FTR_LOWER_SAFE, ID_DFR0_EL1, PerfMon, 0), > - REG_FTR_BITS(FTR_LOWER_SAFE, ID_DFR0_EL1, CopDbg, 0), > + S_REG_FTR_BITS(FTR_LOWER_SAFE, ID_DFR0_EL1, PerfMon, ID_DFR0_EL1_PerfMon_PMUv3), > + REG_FTR_BITS(FTR_LOWER_SAFE, ID_DFR0_EL1, CopDbg, ID_DFR0_EL1_CopDbg_Armv8), > REG_FTR_END, > }; > > @@ -224,13 +228,13 @@ 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) > + if (ftr > ftr_bits->safe_val) > ftr--; > break; > case FTR_HIGHER_SAFE: > @@ -252,7 +256,7 @@ 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) > + if (ftr > ftr_bits->safe_val) > ftr--; > break; > case FTR_HIGHER_SAFE: > @@ -276,7 +280,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 > -- > 2.43.0.381.gb435a96ce8-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel