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 321FAEB64D8 for ; Thu, 22 Jun 2023 13:58:25 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCKoq-0007iu-UD; Thu, 22 Jun 2023 09:57:52 -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 1qCKog-0007al-1b for qemu-riscv@nongnu.org; Thu, 22 Jun 2023 09:57:44 -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 1qCKod-0001Nd-Si for qemu-riscv@nongnu.org; Thu, 22 Jun 2023 09:57:41 -0400 Received: by mail-oo1-xc31.google.com with SMTP id 006d021491bc7-55e1ae72dceso4716493eaf.3 for ; Thu, 22 Jun 2023 06:57:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1687442253; x=1690034253; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xIsSwZv0+6HkvL9zAUnCljJ7f9IbfLIHWBAcagEC0B4=; b=AK3ZzB7zXNvP9PXxij3w2rvJTzu3N2nWmEyQxI/12ZcM0btjHJdtIofMsnQgoCuJ7e 0LXzBupr1nJPDlB1kG180PMYgw/1rgzR2xxct401B78oik/gOHYUFEDN3nXWzZohFv58 drOB6Dnvk6aWfqD6DNyu0PsQnt4eSzUIjQsp/VIlxqos7qRd/iLp0jIJe3W2E/v8/LOW EuobZqKbynkG27TY5+H2HXynUxcAmsPDTEGTLvjB3FZtXeRD8nMTS+UoHdvu/ehZATyj kIZI0JW6zfZvKilGRs51f8Ck/rqzrGpCH6oTteLROgWPoYRLhqKIybse3FG0nwsJZDCT SaAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687442253; x=1690034253; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xIsSwZv0+6HkvL9zAUnCljJ7f9IbfLIHWBAcagEC0B4=; b=R9HoX07Bx41ou1Rh374TUcwHILEyHTemKqkMj/exVSYH5PSdkZzxo6o70EZ3o0zWd3 OKmCsCxV8iGWuskxgjmSVTiFRMPF549fY7FU5mtN5WC259E7P/Qvjs1+pXLNoPXrcO3v 4r/JqzbZn84UJ86FWrhBJab1PDdidXPdz5qs0ZEydZ6xJZal4iepkcWIg6uxbWWtaCDN FQJItUrUstsAwJ39hGUys+qHSUwTEbZ1NLsiboAmV697Vwk0xKCijhjMEBWi/aDozghN +EEsWbwESrMj5c3BdIwn5DKJG/NpYj194Ylo0YiCRmpCbJhm7cgLjLV/b6T5J67NMFrJ u5Zw== X-Gm-Message-State: AC+VfDySZpkjEmK7EnKbBr/h8e3ZOCTidMVHqByjhMDW/3yR718f9/hC CfSzpUqIpBv45NRGrF+x3cA9cQ== X-Google-Smtp-Source: ACHHUZ49haoe/6Oo+TzcrlMemPnezjkWHtNauJFexvLPL39tIlpyP6+KtjbGzNe1zvHRih0Y+4eo4w== X-Received: by 2002:a4a:a592:0:b0:55b:2f80:39e4 with SMTP id d18-20020a4aa592000000b0055b2f8039e4mr11646995oom.4.1687442253047; Thu, 22 Jun 2023 06:57:33 -0700 (PDT) Received: from grind.. (201-69-66-110.dial-up.telesp.net.br. [201.69.66.110]) by smtp.gmail.com with ESMTPSA id w6-20020a4aa446000000b00562f06fb5easm156677ool.11.2023.06.22.06.57.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 06:57:32 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liweiwei@iscas.ac.cn, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH v3 08/19] target/riscv: handle mvendorid/marchid/mimpid for KVM CPUs Date: Thu, 22 Jun 2023 10:56:49 -0300 Message-ID: <20230622135700.105383-9-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230622135700.105383-1-dbarboza@ventanamicro.com> References: <20230622135700.105383-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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-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 After changing user validation for mvendorid/marchid/mimpid to guarantee that the value is validated on user input time, coupled with the work in fetching KVM default values for them by using a scratch CPU, we're certain that the values in cpu->cfg.(mvendorid|marchid|mimpid) are already good to be written back to KVM. There's no need to write the values back for 'host' type CPUs since the values can't be changed, so let's do that just for generic CPUs. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones Acked-by: Alistair Francis --- target/riscv/kvm.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/target/riscv/kvm.c b/target/riscv/kvm.c index cd2974c663..602727cdfd 100644 --- a/target/riscv/kvm.c +++ b/target/riscv/kvm.c @@ -495,6 +495,33 @@ void kvm_arch_init_irq_routing(KVMState *s) { } +static int kvm_vcpu_set_machine_ids(RISCVCPU *cpu, CPUState *cs) +{ + CPURISCVState *env = &cpu->env; + uint64_t id; + int ret; + + id = kvm_riscv_reg_id(env, KVM_REG_RISCV_CONFIG, + KVM_REG_RISCV_CONFIG_REG(mvendorid)); + ret = kvm_set_one_reg(cs, id, &cpu->cfg.mvendorid); + if (ret != 0) { + return ret; + } + + id = kvm_riscv_reg_id(env, KVM_REG_RISCV_CONFIG, + KVM_REG_RISCV_CONFIG_REG(marchid)); + ret = kvm_set_one_reg(cs, id, &cpu->cfg.marchid); + if (ret != 0) { + return ret; + } + + id = kvm_riscv_reg_id(env, KVM_REG_RISCV_CONFIG, + KVM_REG_RISCV_CONFIG_REG(mimpid)); + ret = kvm_set_one_reg(cs, id, &cpu->cfg.mimpid); + + return ret; +} + int kvm_arch_init_vcpu(CPUState *cs) { int ret = 0; @@ -513,6 +540,10 @@ int kvm_arch_init_vcpu(CPUState *cs) } env->misa_ext = isa; + if (!object_dynamic_cast(OBJECT(cpu), TYPE_RISCV_CPU_HOST)) { + ret = kvm_vcpu_set_machine_ids(cpu, cs); + } + return ret; } -- 2.41.0