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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E785FCE79AF for ; Wed, 20 Sep 2023 04:48:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231800AbjITEsZ (ORCPT ); Wed, 20 Sep 2023 00:48:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229770AbjITEsV (ORCPT ); Wed, 20 Sep 2023 00:48:21 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF60D9C for ; Tue, 19 Sep 2023 21:48:14 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4051f8e1ba0so5708335e9.1 for ; Tue, 19 Sep 2023 21:48:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1695185293; x=1695790093; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=m1zNdUzVc6Pr4pcVKMskltzftfT89TOksGte9XFhwTk=; b=NNPGHjV53xANPWwuwjnbRMVW11TDIyX6tRzO2So/mXhIYKDkn8IPbQkLNlLe7CUGPR 2Dg5tYoH33JqtyKSPzztxF11jy3y+rR3RwAXA12dck7wlzlD5EthXdnHM/e0lp69VDyy L7wldaV8/Y5vX+Bf8SciY7BTDPlBYmvX9WV6BLpB6Vo4BkbZkQuahtxOzSrYTKJ3yS9l dJ0HQdmKQZrIVj6D0BBdnkBHzWEMGAotkoH9okLmzWnStK2bsmT/fSoIIvWaEmeMjBN3 ywegrRZYL7yRHCAR4ofb6n5vdWjIXby6b8ArjfriVqIdY4ak1yUqs7i8f2AdNvOh84Cz J+zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695185293; x=1695790093; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=m1zNdUzVc6Pr4pcVKMskltzftfT89TOksGte9XFhwTk=; b=ucaI8gezjTcICy0tmHVqh1IBvUR+Din34ZbHmFXjcGF00fOqunatyzqRcYqtbezNjJ gZW1mOAPZkoWKiT0I1rD8cZmBEvWDTMseUv2sJzVnieExVs/7B49P/zHVjZTRlGa7wRq LJ/3qHNg2mxSFbxD+xlKR0ChH1JZZwyjxOG2gkrDdfauMp6Kgg723IonBWCLLE1K3IDS ahiTeJblOGnUcm9cZB5tXR+3lhTadBEQ3WCrBJP12CY2JzkmlQVD+4lMQaBvSka7pa0H v9i7CHzkFu9P+FcfJsamlq/ZvcKA3sCS5PjppjE7GDEQM1B8cyj0de5BxX9HiQ9e3nBO G2hw== X-Gm-Message-State: AOJu0Yz87nn7WJh7gR4cJq/cOkpSrKNjAuHZ1vAb04LqJo3E6AWWhnNd JwrR+0F2qGGaAUxuRED3qM8NZw== X-Google-Smtp-Source: AGHT+IHNTj0/2lmbfWYjEmf3kCedBQ4IVwJ4KHiViE5ekRfu5L22Fq6enMo4axMx60gYT7DGOhz9tg== X-Received: by 2002:a7b:cd8c:0:b0:401:d2cb:e6f3 with SMTP id y12-20020a7bcd8c000000b00401d2cbe6f3mr1247667wmj.1.1695185293390; Tue, 19 Sep 2023 21:48:13 -0700 (PDT) Received: from localhost (cst2-173-16.cust.vodafone.cz. [31.30.173.16]) by smtp.gmail.com with ESMTPSA id 15-20020a05600c020f00b00401d8810c8bsm805326wmi.15.2023.09.19.21.48.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 21:48:12 -0700 (PDT) Date: Wed, 20 Sep 2023 06:48:11 +0200 From: Andrew Jones To: Atish Patra Cc: Anup Patel , Paolo Bonzini , Shuah Khan , Palmer Dabbelt , Paul Walmsley , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH 4/4] KVM: riscv: selftests: Selectively filter-out AIA registers Message-ID: <20230920-bc0e3956d144be651727e252@orel> References: <20230918180646.1398384-1-apatel@ventanamicro.com> <20230918180646.1398384-5-apatel@ventanamicro.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Sep 19, 2023 at 01:12:47PM -0700, Atish Patra wrote: > On Mon, Sep 18, 2023 at 11:07 AM Anup Patel wrote: > > > > Currently the AIA ONE_REG registers are reported by get-reg-list > > as new registers for various vcpu_reg_list configs whenever Ssaia > > is available on the host because Ssaia extension can only be > > disabled by Smstateen extension which is not always available. > > > > To tackle this, we should filter-out AIA ONE_REG registers only > > when Ssaia can't be disabled for a VCPU. > > > > Fixes: 477069398ed6 ("KVM: riscv: selftests: Add get-reg-list test") > > Signed-off-by: Anup Patel > > --- > > .../selftests/kvm/riscv/get-reg-list.c | 23 +++++++++++++++++-- > > 1 file changed, 21 insertions(+), 2 deletions(-) > > > > diff --git a/tools/testing/selftests/kvm/riscv/get-reg-list.c b/tools/testing/selftests/kvm/riscv/get-reg-list.c > > index 76c0ad11e423..85907c86b835 100644 > > --- a/tools/testing/selftests/kvm/riscv/get-reg-list.c > > +++ b/tools/testing/selftests/kvm/riscv/get-reg-list.c > > @@ -12,6 +12,8 @@ > > > > #define REG_MASK (KVM_REG_ARCH_MASK | KVM_REG_SIZE_MASK) > > > > +static bool isa_ext_cant_disable[KVM_RISCV_ISA_EXT_MAX]; > > + > > bool filter_reg(__u64 reg) > > { > > switch (reg & ~REG_MASK) { > > @@ -48,6 +50,15 @@ bool filter_reg(__u64 reg) > > case KVM_REG_RISCV_ISA_EXT | KVM_RISCV_ISA_EXT_ZIFENCEI: > > case KVM_REG_RISCV_ISA_EXT | KVM_RISCV_ISA_EXT_ZIHPM: > > return true; > > + /* AIA registers are always available when Ssaia can't be disabled */ > > + case KVM_REG_RISCV_CSR | KVM_REG_RISCV_CSR_AIA | KVM_REG_RISCV_CSR_AIA_REG(siselect): > > + case KVM_REG_RISCV_CSR | KVM_REG_RISCV_CSR_AIA | KVM_REG_RISCV_CSR_AIA_REG(iprio1): > > + case KVM_REG_RISCV_CSR | KVM_REG_RISCV_CSR_AIA | KVM_REG_RISCV_CSR_AIA_REG(iprio2): > > + case KVM_REG_RISCV_CSR | KVM_REG_RISCV_CSR_AIA | KVM_REG_RISCV_CSR_AIA_REG(sieh): > > + case KVM_REG_RISCV_CSR | KVM_REG_RISCV_CSR_AIA | KVM_REG_RISCV_CSR_AIA_REG(siph): > > + case KVM_REG_RISCV_CSR | KVM_REG_RISCV_CSR_AIA | KVM_REG_RISCV_CSR_AIA_REG(iprio1h): > > + case KVM_REG_RISCV_CSR | KVM_REG_RISCV_CSR_AIA | KVM_REG_RISCV_CSR_AIA_REG(iprio2h): > > + return isa_ext_cant_disable[KVM_RISCV_ISA_EXT_SSAIA] ? true : false; > > Ahh I guess. you do need the switch case for AIA CSRs but for ISA > extensions can be avoided as it is contiguous. I guess we could so something like case KVM_REG_RISCV_ISA_EXT ... KVM_REG_RISCV_ISA_EXT | KVM_RISCV_ISA_EXT_MAX: for the ISA extensions. Thanks, drew