From patchwork Fri Aug 25 13:08:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 1826065 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=Z4P/YkHW; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RXL4B51fKz1yfF for ; Fri, 25 Aug 2023 23:13:30 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZWZP-0001rk-Mx; Fri, 25 Aug 2023 09:09:47 -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 1qZWZO-0001rQ-AF for qemu-devel@nongnu.org; Fri, 25 Aug 2023 09:09:46 -0400 Received: from mail-oa1-x2d.google.com ([2001:4860:4864:20::2d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qZWZK-00072b-IC for qemu-devel@nongnu.org; Fri, 25 Aug 2023 09:09:46 -0400 Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-1c4f4d67f5bso530025fac.0 for ; Fri, 25 Aug 2023 06:09:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1692968981; x=1693573781; 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=PcrFGy5SXwGgsIRIDU1KFLUdlymxn4q//JVCNfMWLaw=; b=Z4P/YkHWTER8Qez3kIoNO4xccFKtKtuhVom0oimBkwT72csYEHvnx2lmNcOId8ec40 m2/QJGKbksdo5CHGJCtTTanD8dpSHP/WcU6KgcLoeZ7vg+Ao/LVXu9RnYn79sxDt5p17 WxDAZF3qgdPwmRj0PAZfNLoDtHXSmu6DtE5rdTe0qZeFhwyieYWtoan0KySJiBgCFPto rFktuslN4NY6f/+oeNYVF8i3ojafjDOL8jpEViXeS5jMURh6Bk/GtOrGaNahXZ/25hve l+/HVBAKnviNyQGqY7Aj8JJsUVwcuphzZSQ0oBUKH8tI1kKyg/Qu6cNHfxZYdidFXzBT s09g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692968981; x=1693573781; 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=PcrFGy5SXwGgsIRIDU1KFLUdlymxn4q//JVCNfMWLaw=; b=Lzw9ve7NCmjcP0NEPXE0hcD8cXw0ed03nRPEEF00QzKbM8xDpa+keZ7v8a1NYxH0iP kEhJL6mmwjQUVTK9EcqWKAqR9SyIt4+Tt7ePFlc0IR7DwETc6kRv1INzhyyHamCe3ZzR KnSgsh8lWOMbLT5BZ/eHw3hDb/PPOn4fG/Y3M5+N1/sKbEzj1Q+D+Tn90qitzbcf5BXQ 3YaC/8dBhEjzCACUt8GZ6Ib0ZkDZNNY/k/HxpaBvqofUl0hUvDlZL4GN+rH4cCzbE9d9 gUD71GeMpFn2PyYXcgtQtk+gp/nUlhZZy7xOOEcuFkU7QSO68+w4JfBwniQIt/luiRon zTXg== X-Gm-Message-State: AOJu0YyvKd2P1pvRACnsIrCdnpRgt8zKtlT87Cp8qR7l9Ybhs7hULOp4 K6h69zRwLNRMpwBsXxeVC/WBJ1KSsYLZ7qmIenc= X-Google-Smtp-Source: AGHT+IHgY6kP9l1A7Sd1Gtj5qj+jc1ARXETQvlkkoaotL0Or1cU5nvLWrRgbpZpP/c0yWOqSwZG87A== X-Received: by 2002:a05:6870:b61c:b0:1bb:89b1:77b7 with SMTP id cm28-20020a056870b61c00b001bb89b177b7mr3105128oab.16.1692968981228; Fri, 25 Aug 2023 06:09:41 -0700 (PDT) Received: from grind.. ([179.93.21.19]) by smtp.gmail.com with ESMTPSA id ds23-20020a0568705b1700b001c50fb56845sm966189oab.16.2023.08.25.06.09.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Aug 2023 06:09:40 -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, Daniel Henrique Barboza Subject: [PATCH 13/20] target/riscv/kvm: refactor kvm_riscv_init_user_properties() Date: Fri, 25 Aug 2023 10:08:46 -0300 Message-ID: <20230825130853.511782-14-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230825130853.511782-1-dbarboza@ventanamicro.com> References: <20230825130853.511782-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:4860:4864:20::2d; envelope-from=dbarboza@ventanamicro.com; helo=mail-oa1-x2d.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 autolearn=unavailable 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The function is doing way more than just init user properties. We would also like to use the 'user_extension_properties' class property, as the TCG driver is already using, to decide whether KVM should expose user properties or not. Rename kvm_riscv_init_user_properties() to riscv_init_kvm_registers() and leave only the essential, non-optional KVM init functions there. All functions that deals with property handling is now gated via rcc->user_extension_properties. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones --- target/riscv/kvm/kvm-cpu.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 3c4fa43cee..85e8b0a927 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -792,7 +792,7 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmcpu) } } -static void riscv_init_user_properties(Object *cpu_obj) +static void riscv_init_kvm_registers(Object *cpu_obj) { RISCVCPU *cpu = RISCV_CPU(cpu_obj); KVMScratchCPU kvmcpu; @@ -801,7 +801,6 @@ static void riscv_init_user_properties(Object *cpu_obj) return; } - 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); @@ -1295,16 +1294,20 @@ DEFINE_TYPES(riscv_kvm_cpu_type_infos) static void kvm_cpu_instance_init(CPUState *cs) { Object *obj = OBJECT(RISCV_CPU(cs)); + RISCVCPUClass *rcc = RISCV_CPU_GET_CLASS(obj); DeviceState *dev = DEVICE(obj); - riscv_init_user_properties(obj); + riscv_init_kvm_registers(obj); - riscv_add_satp_mode_properties(obj); - riscv_cpu_add_misa_properties(obj); + if (rcc->user_extension_properties) { + kvm_riscv_add_cpu_user_properties(obj); + riscv_add_satp_mode_properties(obj); + riscv_cpu_add_misa_properties(obj); - riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_extensions); - riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_vendor_exts); - riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_experimental_exts); + riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_extensions); + riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_vendor_exts); + riscv_cpu_add_kvm_unavail_prop_array(obj, riscv_cpu_experimental_exts); + } for (Property *prop = riscv_cpu_options; prop && prop->name; prop++) { /* Check if we have a specific KVM handler for the option */