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 8A1FAEB64DC for ; Thu, 6 Jul 2023 12:46:55 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHONf-0005GM-2p; Thu, 06 Jul 2023 08:46:43 -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 1qHONd-0005Fu-18 for qemu-devel@nongnu.org; Thu, 06 Jul 2023 08:46:41 -0400 Received: from mail-oo1-xc31.google.com ([2607:f8b0:4864:20::c31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qHONY-0005J8-OY for qemu-devel@nongnu.org; Thu, 06 Jul 2023 08:46:40 -0400 Received: by mail-oo1-xc31.google.com with SMTP id 006d021491bc7-5607cdb0959so365509eaf.2 for ; Thu, 06 Jul 2023 05:46:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1688647595; x=1691239595; 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=nYjgBZzt066YUWA8F+6WqzSS7eox/EZdz6lxP5hTbM0=; b=WAeAs5WMsTP6KKavc0XPB+GY59qoGxApEtxaVjLYcNkpHL43JvYxc8R5V5Efqy6Kj2 jWOX0335n7q8kQ14spBSnOeEx4Obl39iEwNojcyiDwzBwTbaGcun8Qyiv8bWO8f93GU1 iXyv8wyHUpUjJOFIOl4PjQg2pHuTBR/b/+3fhWaGt/h+r5tN+UJi6bWG1zaSkZ5USQcG g14KPmZgjIB5GX4FeQRJ/xkAI1FdPwKe8Y81oe+1xeoo+kmCZoQF61MZmt/lB4oGjJAt KWlylLKmk+11uarPVdw6uByqSmxJv9+M27xp9BajCnxkm+W3aAsWew1DiO3V5QTetw92 6GrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688647595; x=1691239595; 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=nYjgBZzt066YUWA8F+6WqzSS7eox/EZdz6lxP5hTbM0=; b=Apm21pxGJqiV58EFPGsq9jUyGP+4oMiOUMUKsfJvDN/cuoPZA0FbAyOblWUx5LEKC9 jlpGwlb9BLXHLiGkZHIHXvuZ+9AIhCgpACgi+7emzFfw4j7uI9fSJkFS9gG3W29c1nM0 IoXN3ykAV1qS1r+uBYzHMGncQfZrWqMS5CZkMdM/jLPZIaSgsQOCqqjDr05ZD2zbHb0O xCLNQNCcb3bd3MmvF/Y127muC9cZouJglJsCZO+yHGo7qgAL0UgLBmKavRhmjI/gCULU Lo9WvYL/wEZ70IVa0yKNjfSUHwfp17G/mTOUmPtf0p+6n5ey7KAtr3DQT/pjfX3uFy6H 5hAg== X-Gm-Message-State: ABy/qLY/HmFGtp7A7dr740CxSX9Ztg9VTWxKbRKcvT2USxxDjJx0i9VZ HfDjvDaSCt2I/0cNJ3PDbm2k7w== X-Google-Smtp-Source: APBJJlH/RTRASKChaM+dk7QugFP3mHbUz8e29ZzwdRsH3+A8a5YfseAnw5qQcB5MXwolhmOC3X6VrA== X-Received: by 2002:a4a:3310:0:b0:563:60a4:3513 with SMTP id q16-20020a4a3310000000b0056360a43513mr1001638ooq.7.1688647595332; Thu, 06 Jul 2023 05:46:35 -0700 (PDT) Received: from [192.168.68.107] (201-69-66-110.dial-up.telesp.net.br. [201.69.66.110]) by smtp.gmail.com with ESMTPSA id z4-20020a4a9844000000b0054fd51435efsm655837ooi.8.2023.07.06.05.46.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 06 Jul 2023 05:46:35 -0700 (PDT) Message-ID: Date: Thu, 6 Jul 2023 09:46:30 -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 v9 14/20] target/riscv/kvm.c: add multi-letter extension KVM properties 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: <20230706101738.460804-1-dbarboza@ventanamicro.com> <20230706101738.460804-15-dbarboza@ventanamicro.com> <20230706-b3ce7ed0f6265c69afad8d90@orel> From: Daniel Henrique Barboza In-Reply-To: <20230706-b3ce7ed0f6265c69afad8d90@orel> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=2607:f8b0:4864:20::c31; envelope-from=dbarboza@ventanamicro.com; helo=mail-oo1-xc31.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.091, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@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-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 7/6/23 09:14, Andrew Jones wrote: > On Thu, Jul 06, 2023 at 07:17:32AM -0300, Daniel Henrique Barboza wrote: >> Let's add KVM user properties for the multi-letter extensions that KVM >> currently supports: zicbom, zicboz, zihintpause, zbb, ssaia, sstc, >> svinval and svpbmt. >> >> As with MISA extensions, we're using the KVMCPUConfig type to hold >> information about the state of each extension. However, multi-letter >> extensions have more cases to cover than MISA extensions, so we're >> adding an extra 'supported' flag as well. This flag will reflect if a >> given extension is supported by KVM, i.e. KVM knows how to handle it. >> This is determined during KVM extension discovery in >> kvm_riscv_init_multiext_cfg(), where we test for ENOENT errors. Any > ^ EINVAL Alistair, let me know if you want me to send a v10 with this commit msg fix. Thanks, Daniel > >> other error will cause an abort. >> >> The use of the 'user_set' is similar to what we already do with MISA >> extensions: the flag set only if the user is changing the extension >> state. >> >> The 'supported' flag will be used later on to make an exception for >> users that are disabling multi-letter extensions that are unknown to >> KVM. >> >> Signed-off-by: Daniel Henrique Barboza >> --- >> target/riscv/cpu.c | 8 +++ >> target/riscv/kvm.c | 119 +++++++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 127 insertions(+) >> >> diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c >> index 5c8832a030..31e591a938 100644 >> --- a/target/riscv/cpu.c >> +++ b/target/riscv/cpu.c >> @@ -1860,6 +1860,14 @@ static void riscv_cpu_add_user_properties(Object *obj) >> riscv_cpu_add_misa_properties(obj); >> >> for (prop = riscv_cpu_extensions; prop && prop->name; prop++) { >> +#ifndef CONFIG_USER_ONLY >> + if (kvm_enabled()) { >> + /* Check if KVM created the property already */ >> + if (object_property_find(obj, prop->name)) { >> + continue; >> + } >> + } >> +#endif >> qdev_property_add_static(dev, prop); >> } >> >> diff --git a/target/riscv/kvm.c b/target/riscv/kvm.c >> index 7afd6024e6..2d39ec154f 100644 >> --- a/target/riscv/kvm.c >> +++ b/target/riscv/kvm.c >> @@ -113,6 +113,7 @@ typedef struct KVMCPUConfig { >> target_ulong offset; >> int kvm_reg_id; >> bool user_set; >> + bool supported; >> } KVMCPUConfig; >> >> #define KVM_MISA_CFG(_bit, _reg_id) \ >> @@ -197,6 +198,81 @@ static void kvm_riscv_update_cpu_misa_ext(RISCVCPU *cpu, CPUState *cs) >> } >> } >> >> +#define CPUCFG(_prop) offsetof(struct RISCVCPUConfig, _prop) >> + >> +#define KVM_EXT_CFG(_name, _prop, _reg_id) \ >> + {.name = _name, .offset = CPUCFG(_prop), \ >> + .kvm_reg_id = _reg_id} >> + >> +static KVMCPUConfig kvm_multi_ext_cfgs[] = { >> + KVM_EXT_CFG("zicbom", ext_icbom, KVM_RISCV_ISA_EXT_ZICBOM), >> + KVM_EXT_CFG("zicboz", ext_icboz, KVM_RISCV_ISA_EXT_ZICBOZ), >> + KVM_EXT_CFG("zihintpause", ext_zihintpause, KVM_RISCV_ISA_EXT_ZIHINTPAUSE), >> + KVM_EXT_CFG("zbb", ext_zbb, KVM_RISCV_ISA_EXT_ZBB), >> + KVM_EXT_CFG("ssaia", ext_ssaia, KVM_RISCV_ISA_EXT_SSAIA), >> + KVM_EXT_CFG("sstc", ext_sstc, KVM_RISCV_ISA_EXT_SSTC), >> + KVM_EXT_CFG("svinval", ext_svinval, KVM_RISCV_ISA_EXT_SVINVAL), >> + KVM_EXT_CFG("svpbmt", ext_svpbmt, KVM_RISCV_ISA_EXT_SVPBMT), >> +}; >> + >> +static void kvm_cpu_cfg_set(RISCVCPU *cpu, KVMCPUConfig *multi_ext, >> + uint32_t val) >> +{ >> + int cpu_cfg_offset = multi_ext->offset; >> + bool *ext_enabled = (void *)&cpu->cfg + cpu_cfg_offset; >> + >> + *ext_enabled = val; >> +} >> + >> +static uint32_t kvm_cpu_cfg_get(RISCVCPU *cpu, >> + KVMCPUConfig *multi_ext) >> +{ >> + int cpu_cfg_offset = multi_ext->offset; >> + bool *ext_enabled = (void *)&cpu->cfg + cpu_cfg_offset; >> + >> + return *ext_enabled; >> +} >> + >> +static void kvm_cpu_set_multi_ext_cfg(Object *obj, Visitor *v, >> + const char *name, >> + void *opaque, Error **errp) >> +{ >> + KVMCPUConfig *multi_ext_cfg = opaque; >> + RISCVCPU *cpu = RISCV_CPU(obj); >> + bool value, host_val; >> + >> + if (!visit_type_bool(v, name, &value, errp)) { >> + return; >> + } >> + >> + host_val = kvm_cpu_cfg_get(cpu, multi_ext_cfg); >> + >> + /* >> + * Ignore if the user is setting the same value >> + * as the host. >> + */ >> + if (value == host_val) { >> + return; >> + } >> + >> + if (!multi_ext_cfg->supported) { >> + /* >> + * Error out if the user is trying to enable an >> + * extension that KVM doesn't support. Ignore >> + * option otherwise. >> + */ >> + if (value) { >> + error_setg(errp, "KVM does not support disabling extension %s", >> + multi_ext_cfg->name); >> + } >> + >> + return; >> + } >> + >> + multi_ext_cfg->user_set = true; >> + kvm_cpu_cfg_set(cpu, multi_ext_cfg, value); >> +} >> + >> static void kvm_riscv_add_cpu_user_properties(Object *cpu_obj) >> { >> int i; >> @@ -215,6 +291,15 @@ static void kvm_riscv_add_cpu_user_properties(Object *cpu_obj) >> object_property_set_description(cpu_obj, misa_cfg->name, >> misa_cfg->description); >> } >> + >> + for (i = 0; i < ARRAY_SIZE(kvm_multi_ext_cfgs); i++) { >> + KVMCPUConfig *multi_cfg = &kvm_multi_ext_cfgs[i]; >> + >> + object_property_add(cpu_obj, multi_cfg->name, "bool", >> + NULL, >> + kvm_cpu_set_multi_ext_cfg, >> + NULL, multi_cfg); >> + } >> } >> >> static int kvm_riscv_get_regs_core(CPUState *cs) >> @@ -530,6 +615,39 @@ static void kvm_riscv_init_misa_ext_mask(RISCVCPU *cpu, >> env->misa_ext = env->misa_ext_mask; >> } >> >> +static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmcpu) >> +{ >> + CPURISCVState *env = &cpu->env; >> + uint64_t val; >> + int i, ret; >> + >> + for (i = 0; i < ARRAY_SIZE(kvm_multi_ext_cfgs); i++) { >> + KVMCPUConfig *multi_ext_cfg = &kvm_multi_ext_cfgs[i]; >> + struct kvm_one_reg reg; >> + >> + reg.id = kvm_riscv_reg_id(env, KVM_REG_RISCV_ISA_EXT, >> + multi_ext_cfg->kvm_reg_id); >> + reg.addr = (uint64_t)&val; >> + ret = ioctl(kvmcpu->cpufd, KVM_GET_ONE_REG, ®); >> + if (ret != 0) { >> + if (errno == EINVAL) { >> + /* Silently default to 'false' if KVM does not support it. */ >> + multi_ext_cfg->supported = false; >> + val = false; >> + } else { >> + error_report("Unable to read ISA_EXT KVM register %s, " >> + "error %d", multi_ext_cfg->name, ret); >> + kvm_riscv_destroy_scratch_vcpu(kvmcpu); >> + exit(EXIT_FAILURE); >> + } >> + } else { >> + multi_ext_cfg->supported = true; >> + } >> + >> + kvm_cpu_cfg_set(cpu, multi_ext_cfg, val); >> + } >> +} >> + >> void kvm_riscv_init_user_properties(Object *cpu_obj) >> { >> RISCVCPU *cpu = RISCV_CPU(cpu_obj); >> @@ -542,6 +660,7 @@ void kvm_riscv_init_user_properties(Object *cpu_obj) >> kvm_riscv_add_cpu_user_properties(cpu_obj); >> kvm_riscv_init_machine_ids(cpu, &kvmcpu); >> kvm_riscv_init_misa_ext_mask(cpu, &kvmcpu); >> + kvm_riscv_init_multiext_cfg(cpu, &kvmcpu); >> >> kvm_riscv_destroy_scratch_vcpu(&kvmcpu); >> } >> -- >> 2.41.0 >> > > Otherwise, > > Reviewed-by: Andrew Jones