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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 57A57EB64D7 for ; Wed, 21 Jun 2023 09:44:07 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBuMu-0002J5-U8; Wed, 21 Jun 2023 05:43:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qBuMq-0002Eh-UG for qemu-riscv@nongnu.org; Wed, 21 Jun 2023 05:43:12 -0400 Received: from mail-ot1-x329.google.com ([2607:f8b0:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qBuMp-000175-23 for qemu-riscv@nongnu.org; Wed, 21 Jun 2023 05:43:12 -0400 Received: by mail-ot1-x329.google.com with SMTP id 46e09a7af769-6b4551089c9so4577086a34.2 for ; Wed, 21 Jun 2023 02:43:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1687340590; x=1689932590; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=J6ECwfCxUrbQ7mrGd+S+knUEhOO5grcoBRUGmmvqWEA=; b=Wr+3rLdUdZFVL3LNvePT4UMZ1BPsSbxSKYjYm93/L690kv26bVK453L9NAUa5j6DPp 1spZMqmm6LE6G26NiyqJ+Z7JU4RowxhW4izzHEC8JYi04H+WanwwX7dP9o8/bmTO6fH6 5NY7lrmWThSOQ1k3cxlqc0r1t3lTjk9ZnTjwMtaiADF8BFtj9aP+Ru+N4EdIZ8aVY/ry rKy6fBkamqUq/LvOWIJdfatOMRkauOwSkYgtqaDFdittMNcMXpwuwvfVYJa/fz9gXZE/ 4oD0L7veuH4QuTAxjMbgNQlbvyfKEH2Sg1+yvXIgaSds9fVh2OqHH10yg2RbXvOPYzIX SePA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687340590; x=1689932590; 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=J6ECwfCxUrbQ7mrGd+S+knUEhOO5grcoBRUGmmvqWEA=; b=fX53NJ0ojfQBx4zJI4S5McamEgHG1OYWF8C1Rm6FWxQeG8W+NryGlwSHxFygVFQ1eF SDx1Xcb4D6mHd8+Z0bgb/2zuUqVeUEMlM3XYa5ZcjU31IoMBMlzWT3poM5M5/yjr9MhM 6vel+o77JXfUXI6z/PHAHQBj27AeS4S+Y3jyt1WH/DYR3OX12Y39gEDf0y13yWtTb3Do QKRVsBSh7bpkc6MnCnHLlEkfSX0086BkGj1kFEQA7L2McNgPEHJm8sN02cXLXn/ve7jk +Y/kWrdZak9t2IB2PyPfAeoO7P0EuAbziCvVHygGFvMKm/5xXAyyCrv5F4W6HthLEdE1 SUUA== X-Gm-Message-State: AC+VfDwhVEvBqFkU7deS0NzjTmTtiNqFYKmqg8BS84F/9+/FhFLOohxS gQIJAYZRwzP/NB/+JNSe3Mys/w== X-Google-Smtp-Source: ACHHUZ4xY+SBaqpmqHVL0/Nlv1LWW77xxEPAvumqreaJtSCmsM+DzBVUP2MYX3i2Mj0iuxc42yI2lA== X-Received: by 2002:a9d:74c9:0:b0:696:1583:642 with SMTP id a9-20020a9d74c9000000b0069615830642mr14219233otl.21.1687340589715; Wed, 21 Jun 2023 02:43:09 -0700 (PDT) Received: from [192.168.68.108] (201-69-66-110.dial-up.telesp.net.br. [201.69.66.110]) by smtp.gmail.com with ESMTPSA id i2-20020a9d6242000000b006a662e9f074sm1761808otk.58.2023.06.21.02.43.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 21 Jun 2023 02:43:09 -0700 (PDT) Message-ID: Date: Wed, 21 Jun 2023 06:43:05 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH v2 15/18] target/riscv: make riscv_isa_string_ext() KVM compatible Content-Language: en-US To: Andrew Jones Cc: qemu-devel@nongnu.org, qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liweiwei@iscas.ac.cn, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com References: <20230613205857.495165-1-dbarboza@ventanamicro.com> <20230613205857.495165-16-dbarboza@ventanamicro.com> <20230619-30e78979c13df598ca2e4493@orel> <7c5920b1-8240-9922-c4eb-3d7be7436176@ventanamicro.com> <20230621-6ff3576dad2e55bb261819c8@orel> From: Daniel Henrique Barboza In-Reply-To: <20230621-6ff3576dad2e55bb261819c8@orel> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=2607:f8b0:4864:20::329; envelope-from=dbarboza@ventanamicro.com; helo=mail-ot1-x329.google.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.09, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Sender: qemu-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org On 6/21/23 05:20, Andrew Jones wrote: > On Tue, Jun 20, 2023 at 07:05:18PM -0300, Daniel Henrique Barboza wrote: >> >> >> On 6/19/23 06:54, Andrew Jones wrote: >>> On Tue, Jun 13, 2023 at 05:58:54PM -0300, Daniel Henrique Barboza wrote: >>>> The isa_edata_arr[] is used by riscv_isa_string_ext() to create the >>>> riscv,isa DT attribute. isa_edata_arr[] is kept in sync with the TCG >>>> property vector riscv_cpu_extensions[], i.e. all TCG properties from >>>> this vector that has a riscv,isa representation are included in >>>> isa_edata_arr[]. >>>> >>>> KVM doesn't implement all TCG properties, but allow them to be created >>>> anyway to not force an API change between TCG and KVM guests. Some of >>>> these TCG-only extensions are defaulted to 'true', and users are also >>>> allowed to enable them. KVM doesn't care, but riscv_isa_string_ext() >>>> does. The result is that these TCG-only enabled extensions will appear >>>> in the riscv,isa DT string under KVM. >>>> >>>> To avoid code repetition and re-use riscv_isa_string_ext() for KVM >>>> guests we'll make a couple of tweaks: >>>> >>>> - set env->priv_ver to 'LATEST' for the KVM 'host' CPU. This is needed >>>> because riscv_isa_string_ext() makes a priv check for each extension >>>> before including them in the ISA string. KVM doesn't care about >>>> env->priv_ver, since it's part of the TCG-only CPU validation, so this >>>> change is benign for KVM; >>>> >>>> - add a new 'kvm_available' flag in isa_ext_data struct. This flag is >>>> set via a new ISA_EXT_DATA_ENTRY_KVM macro to report that, for a given >>>> extension, KVM also supports it. riscv_isa_string_ext() then can check >>>> if a given extension is known by KVM and skip it if it's not. >>>> >>>> This will allow us to re-use riscv_isa_string_ext() for KVM guests. >>>> >>>> Signed-off-by: Daniel Henrique Barboza >>>> --- >>>> target/riscv/cpu.c | 28 ++++++++++++++++++++-------- >>>> 1 file changed, 20 insertions(+), 8 deletions(-) >>>> >>>> diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c >>>> index a4f3ed0c17..a773c09645 100644 >>>> --- a/target/riscv/cpu.c >>>> +++ b/target/riscv/cpu.c >>>> @@ -44,11 +44,15 @@ struct isa_ext_data { >>>> const char *name; >>>> int min_version; >>>> int ext_enable_offset; >>>> + bool kvm_available; >>>> }; >>>> #define ISA_EXT_DATA_ENTRY(_name, _min_ver, _prop) \ >>>> {#_name, _min_ver, offsetof(struct RISCVCPUConfig, _prop)} >>>> +#define ISA_EXT_DATA_ENTRY_KVM(_name, _min_ver, _prop) \ >>>> + {#_name, _min_ver, offsetof(struct RISCVCPUConfig, _prop), true} >>>> + >>>> /* >>>> * Here are the ordering rules of extension naming defined by RISC-V >>>> * specification : >>>> @@ -68,14 +72,17 @@ struct isa_ext_data { >>>> * >>>> * Single letter extensions are checked in riscv_cpu_validate_misa_priv() >>>> * instead. >>>> + * >>>> + * ISA_EXT_DATA_ENTRY_KVM() is used to indicate that the extension is >>>> + * also known by the KVM driver. If unsure, use ISA_EXT_DATA_ENTRY(). >>>> */ >>>> static const struct isa_ext_data isa_edata_arr[] = { >>>> - ISA_EXT_DATA_ENTRY(zicbom, PRIV_VERSION_1_12_0, ext_icbom), >>>> - ISA_EXT_DATA_ENTRY(zicboz, PRIV_VERSION_1_12_0, ext_icboz), >>>> + ISA_EXT_DATA_ENTRY_KVM(zicbom, PRIV_VERSION_1_12_0, ext_icbom), >>>> + ISA_EXT_DATA_ENTRY_KVM(zicboz, PRIV_VERSION_1_12_0, ext_icboz), >>>> ISA_EXT_DATA_ENTRY(zicond, PRIV_VERSION_1_12_0, ext_zicond), >>>> ISA_EXT_DATA_ENTRY(zicsr, PRIV_VERSION_1_10_0, ext_icsr), >>>> ISA_EXT_DATA_ENTRY(zifencei, PRIV_VERSION_1_10_0, ext_ifencei), >>>> - ISA_EXT_DATA_ENTRY(zihintpause, PRIV_VERSION_1_10_0, ext_zihintpause), >>>> + ISA_EXT_DATA_ENTRY_KVM(zihintpause, PRIV_VERSION_1_10_0, ext_zihintpause), >>>> ISA_EXT_DATA_ENTRY(zawrs, PRIV_VERSION_1_12_0, ext_zawrs), >>>> ISA_EXT_DATA_ENTRY(zfh, PRIV_VERSION_1_11_0, ext_zfh), >>>> ISA_EXT_DATA_ENTRY(zfhmin, PRIV_VERSION_1_11_0, ext_zfhmin), >>>> @@ -89,7 +96,7 @@ static const struct isa_ext_data isa_edata_arr[] = { >>>> ISA_EXT_DATA_ENTRY(zcmp, PRIV_VERSION_1_12_0, ext_zcmp), >>>> ISA_EXT_DATA_ENTRY(zcmt, PRIV_VERSION_1_12_0, ext_zcmt), >>>> ISA_EXT_DATA_ENTRY(zba, PRIV_VERSION_1_12_0, ext_zba), >>>> - ISA_EXT_DATA_ENTRY(zbb, PRIV_VERSION_1_12_0, ext_zbb), >>>> + ISA_EXT_DATA_ENTRY_KVM(zbb, PRIV_VERSION_1_12_0, ext_zbb), >>>> ISA_EXT_DATA_ENTRY(zbc, PRIV_VERSION_1_12_0, ext_zbc), >>>> ISA_EXT_DATA_ENTRY(zbkb, PRIV_VERSION_1_12_0, ext_zbkb), >>>> ISA_EXT_DATA_ENTRY(zbkc, PRIV_VERSION_1_12_0, ext_zbkc), >>>> @@ -114,13 +121,13 @@ static const struct isa_ext_data isa_edata_arr[] = { >>>> ISA_EXT_DATA_ENTRY(zhinxmin, PRIV_VERSION_1_12_0, ext_zhinxmin), >>>> ISA_EXT_DATA_ENTRY(smaia, PRIV_VERSION_1_12_0, ext_smaia), >>>> ISA_EXT_DATA_ENTRY(smstateen, PRIV_VERSION_1_12_0, ext_smstateen), >>>> - ISA_EXT_DATA_ENTRY(ssaia, PRIV_VERSION_1_12_0, ext_ssaia), >>>> + ISA_EXT_DATA_ENTRY_KVM(ssaia, PRIV_VERSION_1_12_0, ext_ssaia), >>>> ISA_EXT_DATA_ENTRY(sscofpmf, PRIV_VERSION_1_12_0, ext_sscofpmf), >>>> - ISA_EXT_DATA_ENTRY(sstc, PRIV_VERSION_1_12_0, ext_sstc), >>>> + ISA_EXT_DATA_ENTRY_KVM(sstc, PRIV_VERSION_1_12_0, ext_sstc), >>>> ISA_EXT_DATA_ENTRY(svadu, PRIV_VERSION_1_12_0, ext_svadu), >>>> - ISA_EXT_DATA_ENTRY(svinval, PRIV_VERSION_1_12_0, ext_svinval), >>>> + ISA_EXT_DATA_ENTRY_KVM(svinval, PRIV_VERSION_1_12_0, ext_svinval), >>>> ISA_EXT_DATA_ENTRY(svnapot, PRIV_VERSION_1_12_0, ext_svnapot), >>>> - ISA_EXT_DATA_ENTRY(svpbmt, PRIV_VERSION_1_12_0, ext_svpbmt), >>>> + ISA_EXT_DATA_ENTRY_KVM(svpbmt, PRIV_VERSION_1_12_0, ext_svpbmt), >>> >>> This approach looks a bit difficult to maintain (it's hard to even see the >>> _KVM macro uses). The approach will be even more difficult if we add more >>> accelerators. I feel like we need an extension class where objects of that >>> class can be passed to functions like riscv_isa_string_ext(). And then we >>> also need tcg-extension and kvm-extension classes which inherit from >>> the extension class. We can then keep the lists of extensions separate, as >>> you originally proposed, as each list will be of its own type. >> >> So, after coding around a little, I didn't manage to create a KVM list in >> kvm.c file because of how ARRAY_SIZE() (a macro that riscv_isa_string_ext()) >> calculates the array size. If the list is exported from another file the macro >> fails to calculate the size of the array. Similar issues also happens when trying >> to use kvm_multi_ext_cfgs[] in this function. >> >> This means that both tcg and kvm arrays ended up in cpu.c. > > Hmm, I'd really rather we don't have a kvm array in cpu.c. Going back to > duplicating functions like riscv_isa_string_ext() into kvm.c is better, > IMO. > >> The tcg array is >> left untouched (isa_edata_arr). The KVM array uses the same type TCG already >> uses (isa_ext_edata) because it's good enough for KVM as well. I removed the >> 'kvm_available' flag since we're going to manually edit the array. >> >> riscv_isa_string_ext() is then changed to switch between the tcg/kvm array >> as required. The rest of the logic of the function stood the same. I'll also >> add a pre-patch prior to all these changes to simplify riscv_isa_string_ext() >> a bit when running under TCG. > > If we have to teach riscv_isa_string_ext() about both tcg and kvm cfg > types (and any other functions that come along), then this approach > isn't all that helpful anyway. Someone must point the function to the right array. We can do it inside the function, we can pass the array as parameter and the caller will be responsible for it. But somewhere along the road there'll be an 'if (kvm_enabled())'. All this said, the root cause of all this saga is due to extensions being enabled without KVM knowing about it. riscv_isa_string_ext() is quite straightforward: it is going through all the cpu->cfg.ext_() properties and picking the ones enable. If we can ensure that (1) all non-kvm properties are always default to false and (2) there is no way for the user to set them via command line, riscv_isa_string_ext() and all related artifacts can remain untouched. I have an idea to accomplish that. I'll see how it goes. Thanks, Daniel > > Thanks, > drew