From nobody Tue Oct 22 22:26:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1727181969; cv=none; d=zohomail.com; s=zohoarc; b=eAI4ne61COZL6BXmHYRZgJS+aooKiUyJzCBUqjdZVu7uyJjlSXs0P9x9igUQ1CSHNfKqqK2//w6c2DpZUK2R/DMbI8rS6+wixsQjxkzGXzfIRmdpXsEdYNb+RmshH4kq5ivbWKMWkP8IbYvCeq9Zj3HFG6m/drO+eyePw1n+pOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1727181969; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3ZnjQxTMhjoEY0Z6cRJChvJCZU9mx95m8bwJRe3bcaw=; b=JAf5fsok6A1XkGWAxcMRsf/eCFQ0iEriYgBwqFVSw7XqJYNZUp49ZkH81lpIWt6V4Nq8IGYODaxYHzStUzqKWQsTNtgjUIsFitWia5Tyh633HulC3X0gVRaw1WVN+JGeGb8AtGQHWKUOxi67b4Q6WQ8AU3CgM6a+uQ0K7wu6dyY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1727181969862543.8737658290011; Tue, 24 Sep 2024 05:46:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1st4ty-0003Jh-MN; Tue, 24 Sep 2024 08:44:22 -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 1st4tx-0003EM-20 for qemu-devel@nongnu.org; Tue, 24 Sep 2024 08:44:21 -0400 Received: from mail-vk1-xa2d.google.com ([2607:f8b0:4864:20::a2d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1st4tv-0005sh-By for qemu-devel@nongnu.org; Tue, 24 Sep 2024 08:44:20 -0400 Received: by mail-vk1-xa2d.google.com with SMTP id 71dfb90a1353d-502c8f50c5dso1498379e0c.0 for ; Tue, 24 Sep 2024 05:44:19 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([187.101.184.93]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-505aa10a8fbsm767830e0c.49.2024.09.24.05.44.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2024 05:44:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1727181858; x=1727786658; darn=nongnu.org; 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=3ZnjQxTMhjoEY0Z6cRJChvJCZU9mx95m8bwJRe3bcaw=; b=d613en6drmUlETcKBZH2Bn/wlcIUO7wgRefGJWcRCiEJ50wiCUwyEzrya64leQqz7c uNaAjKaRo8ajLf6aPNJKGJNollXqDEOm8XKWdcbrwZ+44xa3w5l4CNjinO2OVuyjqEmy KmcDcObHOsDLwe0pcrggE8GKa0YkohXKHycFS/VSbem+sphxOjyfzkhQeOk5eqFfYoR+ aQB1iP6ZsePTCJPgt7tGq33j8pKFN+Om9DgFh+wVrlgC5eMervmLScdQUQDk7yOMmUCp 4xQSt3rzYqw5IRXOLAukaMXIyoGARlfSj9yqIP9SNckRIMieNRBLWnXIxXSi+KIGtA04 4V2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727181858; x=1727786658; 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=3ZnjQxTMhjoEY0Z6cRJChvJCZU9mx95m8bwJRe3bcaw=; b=jUvmCoGC10XxEtBAZLi4+5qzxkz214HwEPDXn+Jsb8rkvBDwTS8BrDCeFgELA0LNgo b+KVYH4bZwJrLIDMBcChg49To8aoVrIyY9PTdAbg3DbotA/oxaO3k53IbVyghuPxaQvF tzsFLqDnW8fdYceGtsWMnpBK6AqlpdCFAPrmNKGewu+Qo2ukOIcudmAZTY0SLwYrok6q CA5I9LpqEPmYuttebCQ7+DQvKlh1fTFNQZ7r3RRF5vnNSaebEHq1rZfgwkq4ohD6SzWD 7y0QYoUf/VbCYDgf+R11sRuG4xzFKKlsfGMsqT0LI+No5YSyu5ldQo8c4aBkalkw6uJ/ 6h+Q== X-Gm-Message-State: AOJu0Yxj1wtgBl4XrKitzxAiCMgIr3GSZeY5iCvEUwsRaTqpilfjnjCE VtyBLuyi4t9Vzvh/8Y9oYV9+4dJYw5rOEsalvueYCvGVs2Cj8jGJMDC5AXq0NVvDP16XRa98I0F 7 X-Google-Smtp-Source: AGHT+IHG5jeRz54hOcUW+zhSXcsCGwMuwqIxtZolEqAZoN93XKg17gUk2dqeUrsvlSpMBihoP0DSUA== X-Received: by 2002:a05:6122:2020:b0:4ed:12b:ec99 with SMTP id 71dfb90a1353d-503e4076f7cmr8912241e0c.3.1727181857901; Tue, 24 Sep 2024 05:44:17 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH 1/4] target/riscv/kvm: set 'aia_mode' to default in error path Date: Tue, 24 Sep 2024 09:44:04 -0300 Message-ID: <20240924124407.766495-2-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240924124407.766495-1-dbarboza@ventanamicro.com> References: <20240924124407.766495-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::a2d; envelope-from=dbarboza@ventanamicro.com; helo=mail-vk1-xa2d.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1727181970615116600 Content-Type: text/plain; charset="utf-8" When failing to set the selected AIA mode, 'aia_mode' is left untouched. This means that 'aia_mode' will not reflect the actual AIA mode, retrieved in 'default_aia_mode', This is benign for now, but it will impact QMP query commands that will expose the 'aia_mode' value, retrieving the wrong value. Set 'aia_mode' to 'default_aia_mode' if we fail to change the AIA mode in KVM. While we're at it, rework the log/warning messages to be a bit less verbose. Instead of: KVM AIA: default mode is emul qemu-system-riscv64: warning: KVM AIA: failed to set KVM AIA mode We can use a single warning message: qemu-system-riscv64: warning: KVM AIA: failed to set KVM AIA mode 'auto', u= sing default host mode 'emul' Signed-off-by: Daniel Henrique Barboza Acked-by: Alistair Francis --- target/riscv/kvm/kvm-cpu.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 341af901c5..970a7ab2f1 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -1711,18 +1711,26 @@ void kvm_riscv_aia_create(MachineState *machine, ui= nt64_t group_shift, error_report("KVM AIA: failed to get current KVM AIA mode"); exit(1); } - qemu_log("KVM AIA: default mode is %s\n", - kvm_aia_mode_str(default_aia_mode)); =20 - if (default_aia_mode !=3D aia_mode) { + if (default_aia_mode =3D=3D aia_mode) { + qemu_log("KVM AIA: using default host mode '%s'\n", + kvm_aia_mode_str(default_aia_mode)); + } else { ret =3D kvm_device_access(aia_fd, KVM_DEV_RISCV_AIA_GRP_CONFIG, KVM_DEV_RISCV_AIA_CONFIG_MODE, &aia_mode, true, NULL); - if (ret < 0) - warn_report("KVM AIA: failed to set KVM AIA mode"); - else - qemu_log("KVM AIA: set current mode to %s\n", + if (ret < 0) { + warn_report("KVM AIA: failed to set KVM AIA mode '%s', using " + "default host mode '%s'", + kvm_aia_mode_str(aia_mode), + kvm_aia_mode_str(default_aia_mode)); + + /* failed to change AIA mode, use default */ + aia_mode =3D default_aia_mode; + } else { + qemu_log("KVM AIA: setting current mode to %s\n", kvm_aia_mode_str(aia_mode)); + } } =20 ret =3D kvm_device_access(aia_fd, KVM_DEV_RISCV_AIA_GRP_CONFIG, --=20 2.45.2 From nobody Tue Oct 22 22:26:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1727181944; cv=none; d=zohomail.com; s=zohoarc; b=ZzPTPUgwR4PcFyOVHPI2XOUPW8aVjHNOeNP4oo9xISJojwooaFl1lYcv8a/smigTbSp/KyswYraNJrzRNYAzxjpr6hlvqljcNUJ3LWZYE8JkJPYFKU8YR+8jwyOKZZMO4JfxLsqkPwl9GFk8Mx5RO+5/VzDz+zpESvhbLWtRF5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1727181944; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KFr1o/hBOBsQTMIRAihuGpWwsDolabR4H9g+K1D+mEA=; b=Vy6Uo+GHCqTivfCskKXFvRL5EhbPuey1itOVTk6UysczOe5W+C+DCNW3YBbByMiuqsAElxPbBQlQH4D8hAEozJeDzmOfKysvW2izYlizL7CKs7j4V1YYP0RibrnUcggO/RFuotg3VDLEjKeGfuv8K2BgZZRRIESGc3Mo4j0lqc4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1727181944981387.514552675755; Tue, 24 Sep 2024 05:45:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1st4u2-0003XS-13; Tue, 24 Sep 2024 08:44:26 -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 1st4tz-0003Ny-Nf for qemu-devel@nongnu.org; Tue, 24 Sep 2024 08:44:24 -0400 Received: from mail-ua1-x92c.google.com ([2607:f8b0:4864:20::92c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1st4ty-0005tY-48 for qemu-devel@nongnu.org; Tue, 24 Sep 2024 08:44:23 -0400 Received: by mail-ua1-x92c.google.com with SMTP id a1e0cc1a2514c-846c44bfbe7so1097925241.3 for ; Tue, 24 Sep 2024 05:44:21 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([187.101.184.93]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-505aa10a8fbsm767830e0c.49.2024.09.24.05.44.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2024 05:44:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1727181861; x=1727786661; darn=nongnu.org; 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=KFr1o/hBOBsQTMIRAihuGpWwsDolabR4H9g+K1D+mEA=; b=KNxGkkBCG4UtzCZiKsvGTX6P+mLElarTBelJ+i9/j/OeAHsRKo7AuRVT7FEsvFPouQ J7zvwNFBhn9yx5AxsOrF4CybLRXIjiDBdRtZXH3yNVG3v0pujYi89+7VmfEOAoTulX2O A5UGVAwqGVQuv4sBuArvb4KBxN7lojtosProeiRN11pQoRtc0k0Cf/QV1hRSCT6WddI9 F3UwKN0Kivs9JBruNmdzSX9ES9c3YxXAYjV3XOoRqN/Iu4BfSHRLiUXAWwuk6rahMpLM mB905KHEN2eThP8IyToPcGSZ8q6fCBMRKk25PaCA4JJQw4QpcC6XlhWtna1CZHbYIttV DXkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727181861; x=1727786661; 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=KFr1o/hBOBsQTMIRAihuGpWwsDolabR4H9g+K1D+mEA=; b=QGjBq/Dg5CsDIAi/rPYokXNO3eI/+VpaYMT0feBmF7aMUPtzBwweCMjynNBgFdUmb+ hSuq3jrFzTZvnjpCEyVMRpvyg21uQmUuF2oxY9xVLCc7vPPxQduYJnLpdg6E6f4WV1Hv HUFWxNGDGq/G1l+/xms/fcfQGiMsUX0V5QsLqzvO6uYOFZ7626VVJ9AHfmrMlrEWjUqI QSwNoznAVRd1AfzKtVmZJ1SbeIc2OxOzJ6T3dzXa/nC8T0kaV4ep8C3/zTQM2D6m2w/O XF2cWDEekMOJXBHJHOu0utsTYnWf1/kmzco4UJWry029JxbAI1IqAKzIRQQl/56RDRhh a+BQ== X-Gm-Message-State: AOJu0YznwwudXLP+ND6XPBIpMuoafw7912DBP8CuWDb1Vy8vWsiPIu4U oC8VxIaRFfW3WwaGWqN0Lo9B9ZiSO3UvHG0APybb8JLFq0di9cw1cW8bRdIbrkDXINE0J0+CnRd F X-Google-Smtp-Source: AGHT+IGLfIcAlQy2xXNtG3LDGrido84RjPwXwueSEW/3AdCbgqkQAy0xKlagDSassyUZLkR7gBkhGg== X-Received: by 2002:a05:6122:1691:b0:4f5:2276:1366 with SMTP id 71dfb90a1353d-503e04193e4mr9374152e0c.3.1727181860760; Tue, 24 Sep 2024 05:44:20 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH 2/4] target/riscv/kvm: clarify how 'riscv-aia' default works Date: Tue, 24 Sep 2024 09:44:05 -0300 Message-ID: <20240924124407.766495-3-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240924124407.766495-1-dbarboza@ventanamicro.com> References: <20240924124407.766495-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::92c; envelope-from=dbarboza@ventanamicro.com; helo=mail-ua1-x92c.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1727181946775116600 Content-Type: text/plain; charset="utf-8" We do not have control in the default 'riscv-aia' default value. We can try to set it to a specific value, in this case 'auto', but there's no guarantee that the host will accept it. Couple with this we're always doing a 'qemu_log' to inform whether we're ended up using the host default or if we managed to set the AIA mode to the QEMU default we wanted to set. Change the 'riscv-aia' description to better reflect how the option works, and remove the two informative 'qemu_log' that are now unneeded: if no message shows, riscv-aia was set to the default or uset-set value. Signed-off-by: Daniel Henrique Barboza Acked-by: Alistair Francis --- target/riscv/kvm/kvm-cpu.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 970a7ab2f1..32f3dd6a43 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -1676,9 +1676,9 @@ void kvm_arch_accel_class_init(ObjectClass *oc) object_class_property_add_str(oc, "riscv-aia", riscv_get_kvm_aia, riscv_set_kvm_aia); object_class_property_set_description(oc, "riscv-aia", - "Set KVM AIA mode. Valid values = are " - "emul, hwaccel, and auto. Defaul= t " - "is auto."); + "Set KVM AIA mode. Valid values are 'emul', 'hwaccel' and 'auto'. " + "Changing KVM AIA modes relies on host support. Defaults to 'auto'= " + "if the host supports it"); object_property_set_default_str(object_class_property_find(oc, "riscv-= aia"), "auto"); } @@ -1712,10 +1712,7 @@ void kvm_riscv_aia_create(MachineState *machine, uin= t64_t group_shift, exit(1); } =20 - if (default_aia_mode =3D=3D aia_mode) { - qemu_log("KVM AIA: using default host mode '%s'\n", - kvm_aia_mode_str(default_aia_mode)); - } else { + if (default_aia_mode !=3D aia_mode) { ret =3D kvm_device_access(aia_fd, KVM_DEV_RISCV_AIA_GRP_CONFIG, KVM_DEV_RISCV_AIA_CONFIG_MODE, &aia_mode, true, NULL); @@ -1727,9 +1724,6 @@ void kvm_riscv_aia_create(MachineState *machine, uint= 64_t group_shift, =20 /* failed to change AIA mode, use default */ aia_mode =3D default_aia_mode; - } else { - qemu_log("KVM AIA: setting current mode to %s\n", - kvm_aia_mode_str(aia_mode)); } } =20 --=20 2.45.2 From nobody Tue Oct 22 22:26:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1727181925; cv=none; d=zohomail.com; s=zohoarc; b=fNeWkcWSslUmozeF4GKOfaWFv6cfpa5bZ0B+Gb7SnWUmYL9FZL6HFFqr9NTWwdgNHwBCMKuBExKKWCx9z4mkjtGCySTEi0qLG4uRUXhwH1NTx1E5kTEjKo7Gq1RSUAMRtUWpQLzsgs3la4REcMN4U2NvNJQlpn/Fao7HaJAtQSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1727181925; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=677keSA/AToPRkUUTw9YbPGSGOCBACjoAMcuiE16UlA=; b=RFDIUi4hq2znp8YCb9I34G6sbY/OKc55LI7uvex3GLSOcs5CAUvgFGtfXlJs1Vsjx+1aqhoat0627P5mp55ylFIvV02QCpQvDGEcwHMWWsnQwy0i1umSpXHojt5GiY8lExiuJvPWD4q0swOwX2ooyehC0S+ofDoXnnp9KcnEVAI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1727181925129857.9170280304721; Tue, 24 Sep 2024 05:45:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1st4u4-0003iI-Si; Tue, 24 Sep 2024 08:44:28 -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 1st4u3-0003dw-He for qemu-devel@nongnu.org; Tue, 24 Sep 2024 08:44:27 -0400 Received: from mail-ua1-x929.google.com ([2607:f8b0:4864:20::929]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1st4u1-0005u2-V7 for qemu-devel@nongnu.org; Tue, 24 Sep 2024 08:44:27 -0400 Received: by mail-ua1-x929.google.com with SMTP id a1e0cc1a2514c-848769482c9so1512623241.0 for ; Tue, 24 Sep 2024 05:44:25 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([187.101.184.93]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-505aa10a8fbsm767830e0c.49.2024.09.24.05.44.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2024 05:44:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1727181864; x=1727786664; darn=nongnu.org; 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=677keSA/AToPRkUUTw9YbPGSGOCBACjoAMcuiE16UlA=; b=dm0wh8aJdkfcWN7bYBjIO/TIDxYEd9MRBoTfdPXGiKa2nWRUQdyESYWaR9l9txXMF4 YSbt83i5BCJg7mAP90ZWQgCnAMlHi3M3gqiYNBywnFUYiHB310LWmH8hAkdnCgXCgAQq rpiJRW+GXReT5txj2UN0yuufigZ6Yyykmi172MGrLK+ukI61Ha/P2vNrx86bv6L3lWTQ iaalt6+5g7HKs0W03QCVkqGru1Px23E0INpnzQCQujKBGdC4Ypji9QjZz1kJzndH57wn MDWxNBQGDViTecvBdS5mUF/iXNz6DSsHND/O+cuZYewWu1sXDU+0cXGf6wdUzUk0iFR/ NL7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727181864; x=1727786664; 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=677keSA/AToPRkUUTw9YbPGSGOCBACjoAMcuiE16UlA=; b=RL2wOQH54rTEtRMTGMJKx954ZjYXsjCdRAk4F8eYX405BzllZ5ec3TrpW5VSeL396h cHc/WCDvHCghiphBTqqGNEPBA9U8rSkSPP8HE5YDGWNW2qDBQ0p3Yvc6205tSjlzYNJx gLYeoL/z9Rv4pgKuDLyyMHlQLJOTLrGjnrMyhdNoXaIHZD+tpeVxDS1owN9avtpqEScx W0v5JtS/+HFkCHszBW8AN4vWP0ae0SX5gsZQanUjoQzLlk6L2CTTc50Vwau8kT9vCeW8 2tCVgdG/dKElusNP9rhHqVwl9Qf9cWgQstm6Z/3eqnsUX945mh0jEeqklH6A1r/TNMLG RMUg== X-Gm-Message-State: AOJu0Yz6jknWDSdAKw61cMn/Scm4WcAfW08hNCDoogcIbh/aLR8ZtVYr /UhTAQ48tVh5zFuvn763dGvJbq6VEFwcgwfCIXxHQWArYL9F+5SX1aC/6+5Bm3lg8y/Cf2vWoUl p X-Google-Smtp-Source: AGHT+IHJrUXccfy+/7KatlTRAS8FofVhz+Za3zDzoGS4SijTtO2Qh/kpFqMqU0zMuUqIAMhQeIT5tw== X-Received: by 2002:a05:6122:2523:b0:502:bd0d:abe2 with SMTP id 71dfb90a1353d-503e040bce8mr11968512e0c.6.1727181863848; Tue, 24 Sep 2024 05:44:23 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH 3/4] target/riscv/kvm: add kvm-aia bools props Date: Tue, 24 Sep 2024 09:44:06 -0300 Message-ID: <20240924124407.766495-4-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240924124407.766495-1-dbarboza@ventanamicro.com> References: <20240924124407.766495-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::929; envelope-from=dbarboza@ventanamicro.com; helo=mail-ua1-x929.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1727181926785116600 Content-Type: text/plain; charset="utf-8" Boolean properties are preferrable in comparision to string properties since they don't require a string parsing. Add three bools that represents the available kvm-aia mode: riscv-aia-emul, riscv-aia-hwaccel, riscv-aia-auto. They work like the existing riscv-aia string property, i.e. if no bool is set we'll default to riscv-aia-auto, if the host supports it. Signed-off-by: Daniel Henrique Barboza --- target/riscv/kvm/kvm-cpu.c | 77 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 32f3dd6a43..e256e3fc48 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -1671,6 +1671,62 @@ static void riscv_set_kvm_aia(Object *obj, const cha= r *val, Error **errp) } } =20 +static void riscv_set_kvm_aia_bool(uint32_t aia_bool, bool val) +{ + bool default_aia_mode =3D KVM_DEV_RISCV_AIA_MODE_AUTO; + + g_assert(aia_bool <=3D KVM_DEV_RISCV_AIA_MODE_AUTO); + + if (val) { + aia_mode =3D aia_bool; + return; + } + + /* + * Setting an aia_bool to 'false' does nothing if + * aia_mode isn't set to aia_bool. + */ + if (aia_mode !=3D aia_bool) { + return; + } + + /* + * Return to default value if we're disabling the + * current set aia_mode. + */ + aia_mode =3D default_aia_mode; +} + +static bool riscv_get_kvm_aia_emul(Object *obj, Error **errp) +{ + return aia_mode =3D=3D KVM_DEV_RISCV_AIA_MODE_EMUL; +} + +static void riscv_set_kvm_aia_emul(Object *obj, bool val, Error **errp) +{ + riscv_set_kvm_aia_bool(KVM_DEV_RISCV_AIA_MODE_EMUL, val); +} + +static bool riscv_get_kvm_aia_hwaccel(Object *obj, Error **errp) +{ + return aia_mode =3D=3D KVM_DEV_RISCV_AIA_MODE_HWACCEL; +} + +static void riscv_set_kvm_aia_hwaccel(Object *obj, bool val, Error **errp) +{ + riscv_set_kvm_aia_bool(KVM_DEV_RISCV_AIA_MODE_HWACCEL, val); +} + +static bool riscv_get_kvm_aia_auto(Object *obj, Error **errp) +{ + return aia_mode =3D=3D KVM_DEV_RISCV_AIA_MODE_AUTO; +} + +static void riscv_set_kvm_aia_auto(Object *obj, bool val, Error **errp) +{ + riscv_set_kvm_aia_bool(KVM_DEV_RISCV_AIA_MODE_AUTO, val); +} + void kvm_arch_accel_class_init(ObjectClass *oc) { object_class_property_add_str(oc, "riscv-aia", riscv_get_kvm_aia, @@ -1681,6 +1737,27 @@ void kvm_arch_accel_class_init(ObjectClass *oc) "if the host supports it"); object_property_set_default_str(object_class_property_find(oc, "riscv-= aia"), "auto"); + + object_class_property_add_bool(oc, "riscv-aia-emul", + riscv_get_kvm_aia_emul, + riscv_set_kvm_aia_emul); + object_class_property_set_description(oc, "riscv-aia-emul", + "Set KVM AIA mode to 'emul'. Changing KVM AIA modes relies on host= " + "support. Default mode is 'auto' if the host supports it"); + + object_class_property_add_bool(oc, "riscv-aia-hwaccel", + riscv_get_kvm_aia_hwaccel, + riscv_set_kvm_aia_hwaccel); + object_class_property_set_description(oc, "riscv-aia-hwaccel", + "Set KVM AIA mode to 'hwaccel'. Changing KVM AIA modes relies on h= ost " + "support. Default mode is 'auto' if the host supports it"); + + object_class_property_add_bool(oc, "riscv-aia-auto", + riscv_get_kvm_aia_auto, + riscv_set_kvm_aia_auto); + object_class_property_set_description(oc, "riscv-aia-auto", + "Set KVM AIA mode to 'auto'. Changing KVM AIA modes " + "relies on host support"); } =20 void kvm_riscv_aia_create(MachineState *machine, uint64_t group_shift, --=20 2.45.2 From nobody Tue Oct 22 22:26:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1727181970; cv=none; d=zohomail.com; s=zohoarc; b=LFbHWLQTSwrMoYAaqYfsQn506bswC5jmxZEZKURN6J/Ifp39EoTq+rGZrtvKFAXj61SkfQuXtKtRIgPvyGjxsSmbEKiFR+6wTtJ6lsZtwNt6qxC/yPWutppjGhbPBc+QUAM4xwveirGc+29p1mkLw6lxhd/bEypeP0lhAOmVR0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1727181970; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zRTK5I7NFMS9CrB62Z8+YS9pz/eTcEjdmLZgOi2DrpE=; b=JUDyUgep/+5qVFMkw6NogeewHSYuUFiUzxGuJbC49QMzYje3PkRPNVSC9XvrtX0AgbhKlrv83stFhveO+UDQQYu759aGfBInH1B4ghOZufEiN/5SWVqxgkzTfhdy0vLhCltFklCUlAt5D3m7+w5jVyNctJjylEV2rZG0ouYYDzM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1727181970015529.2315728654801; Tue, 24 Sep 2024 05:46:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1st4u7-0003tm-Cu; Tue, 24 Sep 2024 08:44:31 -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 1st4u5-0003m1-HD for qemu-devel@nongnu.org; Tue, 24 Sep 2024 08:44:29 -0400 Received: from mail-vk1-xa30.google.com ([2607:f8b0:4864:20::a30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1st4u4-0005uN-2m for qemu-devel@nongnu.org; Tue, 24 Sep 2024 08:44:29 -0400 Received: by mail-vk1-xa30.google.com with SMTP id 71dfb90a1353d-50108a42fa9so1550498e0c.3 for ; Tue, 24 Sep 2024 05:44:27 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([187.101.184.93]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-505aa10a8fbsm767830e0c.49.2024.09.24.05.44.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2024 05:44:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1727181867; x=1727786667; darn=nongnu.org; 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=zRTK5I7NFMS9CrB62Z8+YS9pz/eTcEjdmLZgOi2DrpE=; b=I7L57b1Ba0wRQs7cjMXVHAI0n6UcUTMV/nGrlGMaTwzyHy8wUuZ0Y2EfPKd2tWZZTL AkfaEOO7Br6Rjh/s9bedCrl4LEXAPfJXUXZ1sGw/Qw7YjSVgcIgFTW+49h4mVKRG1POj Ma68Cn5nSGWHuZAeH4tfkx45ph97AbY37QO4nYB9zbLN91eo64KpFHzclf3Pt3j3/8TG h6qfmGz1pumHybt+mXJZsP+nhhKJ1zSBGnqhTPUdA0lr5hzf3T+DyahJjNVGLPH0swsn iyMROuqnC3sQ/tXLFdZz/+UCtr7tSaJ3zKZjhWXy+Ff+19L1YMZsZlJA1EKtICuqogl5 EPXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727181867; x=1727786667; 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=zRTK5I7NFMS9CrB62Z8+YS9pz/eTcEjdmLZgOi2DrpE=; b=ehxEwEARYTm8caAc3m8WOUub2I8wIX2rsojxPtU7zG3/2hnIF3GNyXVHMwacxDS/n1 K8GnDDYWDpiAwulXdz0Ly3D+hSH6lvxpnSMJrKh6iWhtAt8e+BPzrBDoBSnqM/hbhUP+ ttj/Rq7HZZkWAEdmthyWhTG42wR4jNAhLOkPHKXRoQ4MDQwlk8NCodFPlIWTZ9so2lzo 87VL7lyjpDiabqmqvRXy7FaAshs8b2QCcbnovGMYknHnWPnwat0jJzi7X2zO+B1Z4So1 MSB8sp3LKiuljnOwIgELzaG19H1CcT6itSCMT3u+59rCROTZem2VDXoLS6z1nb1kQ83a Xidw== X-Gm-Message-State: AOJu0YyA/+B0VTgpJzee68MH2CaeYLgqRPLudHEaDLNNImAmxyeq1AQI b+kBqUhAeWmOo67Yr5ytzPlZSeQsFxt5XEGcyq2IJf7xdJ/bZP3yMNU7vGcMZ3Kx/JzC/o5U9Fb 7 X-Google-Smtp-Source: AGHT+IEYQXV8QUmt+M0ZCsXm9bRzxZpLTti2uXsoIbDtJnNoPAh1Lpl/2bD/QZ2ki8uWX26DLWs+Sw== X-Received: by 2002:a05:6122:8ce:b0:4f5:254e:e111 with SMTP id 71dfb90a1353d-503e4113966mr8542643e0c.7.1727181866743; Tue, 24 Sep 2024 05:44:26 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH 4/4] target/riscv/kvm: deprecate riscv-aia string prop Date: Tue, 24 Sep 2024 09:44:07 -0300 Message-ID: <20240924124407.766495-5-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240924124407.766495-1-dbarboza@ventanamicro.com> References: <20240924124407.766495-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::a30; envelope-from=dbarboza@ventanamicro.com; helo=mail-vk1-xa30.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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1727181970612116600 Content-Type: text/plain; charset="utf-8" We want to use the new boolean properties instead: riscv-aia-emul, riscv-aia-hwaccel and riscv-aia-auto. Mark the string prop 'riscv-aia' for deprecation. Signed-off-by: Daniel Henrique Barboza --- docs/about/deprecated.rst | 8 ++++++++ target/riscv/kvm/kvm-cpu.c | 1 + 2 files changed, 9 insertions(+) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index ed31d4b0b2..d3e0e3e303 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -463,6 +463,14 @@ available firmwares that are using the current (wrong)= name. The property is kept as is in 9.1, together with "riscv,delegation", to give more time for firmware developers to change their code. =20 +RISC-V "riscv-aia" KVM property (since 9.2) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +This property was deprecated in favor of using the boolean properties +'riscv-aia-emul', 'riscv-aia-hwaccel' and 'riscv-aia-auto'. The +motivation behind it is to make it easier to expose the internal +state of the KVM accelerator in APIs such as query-cpu-model-expansion. + Migration --------- =20 diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index e256e3fc48..610057870f 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -1732,6 +1732,7 @@ void kvm_arch_accel_class_init(ObjectClass *oc) object_class_property_add_str(oc, "riscv-aia", riscv_get_kvm_aia, riscv_set_kvm_aia); object_class_property_set_description(oc, "riscv-aia", + "DEPRECATED: use riscv-aia- properties instead. " "Set KVM AIA mode. Valid values are 'emul', 'hwaccel' and 'auto'. " "Changing KVM AIA modes relies on host support. Defaults to 'auto'= " "if the host supports it"); --=20 2.45.2