From nobody Mon Apr 14 12:00:16 2025
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;
dmarc=pass(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1736326076; cv=none;
d=zohomail.com; s=zohoarc;
b=ZSWYqi3XYIThcucKhZYl30f8bSDI/ZgdHdf/qDVcC0ckqvci5KPJQy57cuuvJvJImrJt8hEhARvqAO03PwdL76KsXX6NHqF+EAWv8Fx17E8x9mf/mkAuZedaqw8Nf2XfyX1rJLcW6GrPaAQQiKS1MjxYpuot5ytlPV0PqqFqVXk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736326076;
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=xtt7zL2LqAhjv4uhbRY+AeD/Ww1OdaklRRNJ3QL6zLg=;
b=n5IO9wyGlqYYFytEQmI00JqaM/1B7cIJWYcIzK8+ysrEyVWUwftA3TIqDP8+dg4kuM/Y8zRPDDzwqrZFdIlrafvGExRKjAYjBMXa8RwPnZh11eYtCF6JU1Vd9pQ9aksbuAvSytsQcbszOXnQhM2u/X3nL0XFmizj8V40L1LcOdI=
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;
dmarc=pass header.from=<thuth@redhat.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 173632607651689.59630797160389;
Wed, 8 Jan 2025 00:47:56 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tVRgy-00062T-TD; Wed, 08 Jan 2025 03:45:32 -0500
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 <thuth@redhat.com>) id 1tVRgw-00061U-TV
for qemu-devel@nongnu.org; Wed, 08 Jan 2025 03:45:31 -0500
Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <thuth@redhat.com>) id 1tVRgv-0001lF-C0
for qemu-devel@nongnu.org; Wed, 08 Jan 2025 03:45:30 -0500
Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com
(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by
relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
cipher=TLS_AES_256_GCM_SHA384) id us-mta-32-RJgsXw_GPdSw6ImRS62iCw-1; Wed,
08 Jan 2025 03:45:26 -0500
Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com
(mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest
SHA256)
(No client certificate requested)
by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
id E55AF1955F79; Wed, 8 Jan 2025 08:45:25 +0000 (UTC)
Received: from thuth-p1g4.str.redhat.com (dhcp-192-228.str.redhat.com
[10.33.192.228])
by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
id 662BF19560AB; Wed, 8 Jan 2025 08:45:24 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1736325928;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=xtt7zL2LqAhjv4uhbRY+AeD/Ww1OdaklRRNJ3QL6zLg=;
b=MsHat+joY5nXu1IoiOJMceMwMsTHJ/LhfePmrbroIHvRK5YU8zYyWYNZOZgTd4qMZ88Qnc
pBUaNJEKW/XTQiJaKPdM0TVDLYDg7cw4zgWw4U6vz2ZbgMa2X9uJcjt9uqn/+kqRDwz8k0
ZhzRlQFr7c5Q/QwJst11x6W+139rom8=
X-MC-Unique: RJgsXw_GPdSw6ImRS62iCw-1
X-Mimecast-MFC-AGG-ID: RJgsXw_GPdSw6ImRS62iCw
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>, Cornelia Huck <cohuck@redhat.com>,
Christian Borntraeger <borntraeger@linux.ibm.com>
Subject: [PULL 05/14] hw/s390x: Remove the "ri_allowed" switch
Date: Wed, 8 Jan 2025 09:45:02 +0100
Message-ID: <20250108084511.238458-6-thuth@redhat.com>
In-Reply-To: <20250108084511.238458-1-thuth@redhat.com>
References: <20250108084511.238458-1-thuth@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12
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=170.10.133.124; envelope-from=thuth@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
X-Spam_score_int: -14
X-Spam_score: -1.5
X-Spam_bar: -
X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.437,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001,
RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
TVD_SUBJ_WIPE_DEBT=1.004 autolearn=no autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=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 @redhat.com)
X-ZM-MESSAGEID: 1736326078666116600
Content-Type: text/plain; charset="utf-8"
Only s390-ccw-virtio-2.6 and older used to set this switch to "off",
for newer machine types it is always enabled. Since we removed the
old machine types now, we can also remove the switch in the code and
assume that it is always enabled now.
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Christian Borntraeger <borntraeger@linux.ibm.com>
Message-ID: <20250103144232.520383-5-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
include/hw/s390x/s390-virtio-ccw.h | 3 ---
hw/s390x/s390-virtio-ccw.c | 14 ++++----------
target/s390x/kvm/kvm.c | 6 ++----
3 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-vir=
tio-ccw.h
index 599740a998..4559dbf1bd 100644
--- a/include/hw/s390x/s390-virtio-ccw.h
+++ b/include/hw/s390x/s390-virtio-ccw.h
@@ -53,14 +53,11 @@ struct S390CcwMachineClass {
MachineClass parent_class;
=20
/*< public >*/
- bool ri_allowed;
bool cpu_model_allowed;
bool hpage_1m_allowed;
int max_threads;
};
=20
-/* runtime-instrumentation allowed by the machine */
-bool ri_allowed(void);
/* cpu model allowed by the machine */
bool cpu_model_allowed(void);
/* 1M huge page mappings allowed by the machine */
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 341430a101..ffeee2da48 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -725,10 +725,10 @@ static S390CcwMachineClass *current_mc;
* various "*_allowed" variables are enabled, so that the *_allowed() wrap=
pers
* below return the correct default value for the "none" machine.
*
- * Attention! Do *not* add additional new wrappers for CPU features (e.g. =
like
- * the ri_allowed() wrapper) via this mechanism anymore. CPU features shou=
ld
- * be handled via the CPU models, i.e. checking with cpu_model_allowed() d=
uring
- * CPU initialization and s390_has_feat() later should be sufficient.
+ * Attention! Do *not* add additional new wrappers for CPU features via th=
is
+ * mechanism anymore. CPU features should be handled via the CPU models,
+ * i.e. checking with cpu_model_allowed() during CPU initialization and
+ * s390_has_feat() later should be sufficient.
*/
static S390CcwMachineClass *get_machine_class(void)
{
@@ -744,11 +744,6 @@ static S390CcwMachineClass *get_machine_class(void)
return current_mc;
}
=20
-bool ri_allowed(void)
-{
- return get_machine_class()->ri_allowed;
-}
-
bool cpu_model_allowed(void)
{
return get_machine_class()->cpu_model_allowed;
@@ -791,7 +786,6 @@ static void ccw_machine_class_init(ObjectClass *oc, voi=
d *data)
HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(oc);
S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc);
=20
- s390mc->ri_allowed =3D true;
s390mc->cpu_model_allowed =3D true;
s390mc->hpage_1m_allowed =3D true;
s390mc->max_threads =3D 1;
diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
index db645a4813..540b474398 100644
--- a/target/s390x/kvm/kvm.c
+++ b/target/s390x/kvm/kvm.c
@@ -374,10 +374,8 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
kvm_vm_enable_cap(s, KVM_CAP_S390_VECTOR_REGISTERS, 0);
kvm_vm_enable_cap(s, KVM_CAP_S390_USER_STSI, 0);
kvm_vm_enable_cap(s, KVM_CAP_S390_CPU_TOPOLOGY, 0);
- if (ri_allowed()) {
- if (kvm_vm_enable_cap(s, KVM_CAP_S390_RI, 0) =3D=3D 0) {
- cap_ri =3D 1;
- }
+ if (kvm_vm_enable_cap(s, KVM_CAP_S390_RI, 0) =3D=3D 0) {
+ cap_ri =3D 1;
}
if (cpu_model_allowed()) {
kvm_vm_enable_cap(s, KVM_CAP_S390_GS, 0);
--=20
2.47.1