From nobody Sun Feb 8 12:06:47 2026 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=1692040041; cv=none; d=zohomail.com; s=zohoarc; b=fq/IzsVmOlcvodCodZL4fWwoc2QaB06WN1oTtcuTl85KvNB5+legeRSNZbtQ7Dnk3P888ufkh7qKwJoKrwmOgXZ9dOGgYF/czdOyZDXw05Nydf1859TYNBNwQiVvsb8PFNqL+F5+BF0P1ykYmLlu/ubyIBEPhd2/a+7DbuYCEew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692040041; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=1FRmMzzlevhT337L3BaneiXPl8xNqyvPQT8IIfZW2Cs=; b=d8gQI7bzb1JfjqVNMxXEzM6354AJK5izGQi+hBoMQeYrBNQR6yHVwmEueBO9I+n0vakb73cuPPC6EeyqQMizyNC/deVtREI1fFRIKQc3NyrL09fXyOaEf+QloHqp1HkGxN9hu4enhVDLKhhDILoxuVKrdVtKQsDiplsB+hFT73A= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1692040041387953.7090184096049; Mon, 14 Aug 2023 12:07:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVctO-0006tx-Ly; Mon, 14 Aug 2023 15:06:18 -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 1qVctN-0006te-DI for qemu-devel@nongnu.org; Mon, 14 Aug 2023 15:06:17 -0400 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 ) id 1qVctL-000315-L9 for qemu-devel@nongnu.org; Mon, 14 Aug 2023 15:06:17 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-526-q1t63h3_MBmMqUgJsu4D0Q-1; Mon, 14 Aug 2023 15:06:10 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 743BA80557C; Mon, 14 Aug 2023 19:06:10 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1EE44021B9; Mon, 14 Aug 2023 19:06:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692039974; 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; bh=1FRmMzzlevhT337L3BaneiXPl8xNqyvPQT8IIfZW2Cs=; b=C/dCc9R8uunC7ph1Ezo1etHW6yTmTELyHjkHlI03290yoEpcOpdoRk2iR2XrYfD7/Yzdir vIGkUC//WuBMSnn+aKIuXzmCwBzZb5xWUUiMHJtD+7g+EfB1Uf+cS2yoNdogEo4r5jEZsK Jmu/mg/KMmx3Hhr9m7dBhgNCyvhsFdA= X-MC-Unique: q1t63h3_MBmMqUgJsu4D0Q-1 From: Thomas Huth To: qemu-s390x@nongnu.org, Halil Pasic , Christian Borntraeger Cc: qemu-devel@nongnu.org, David Hildenbrand Subject: [PATCH for-8.2] target/s390x/kvm: Simplify the GPRs, ACRs, CRs and prefix synchronization code Date: Mon, 14 Aug 2023 21:06:04 +0200 Message-Id: <20230814190604.907982-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 @redhat.com) X-ZM-MESSAGEID: 1692040090712100001 Content-Type: text/plain; charset="utf-8" KVM_SYNC_GPRS, KVM_SYNC_ACRS, KVM_SYNC_CRS and KVM_SYNC_PREFIX are available since kernel 3.10. Since we already require at least kernel 3.15 in the s390x KVM code, we can assume that the KVM_CAP_SYNC_REGS sync code is always possible for these registers, and remove the related checks and fallbacks via KVM_SET_REGS and KVM_GET_REGS. Signed-off-by: Thomas Huth --- target/s390x/kvm/kvm.c | 119 ++++++++++++----------------------------- 1 file changed, 34 insertions(+), 85 deletions(-) diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c index a9e5880349..ff415f7b30 100644 --- a/target/s390x/kvm/kvm.c +++ b/target/s390x/kvm/kvm.c @@ -148,7 +148,6 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[= ] =3D { KVM_CAP_LAST_INFO }; =20 -static int cap_sync_regs; static int cap_async_pf; static int cap_mem_op; static int cap_mem_op_extension; @@ -342,21 +341,28 @@ static void ccw_machine_class_foreach(ObjectClass *oc= , void *opaque) =20 int kvm_arch_init(MachineState *ms, KVMState *s) { + int required_caps[] =3D { + KVM_CAP_DEVICE_CTRL, + KVM_CAP_SYNC_REGS, + }; + + for (int i =3D 0; i < ARRAY_SIZE(required_caps); i++) { + if (!kvm_check_extension(s, required_caps[i])) { + error_report("KVM is missing capability #%d - " + "please use kernel 3.15 or newer", required_caps[= i]); + return -1; + } + } + object_class_foreach(ccw_machine_class_foreach, TYPE_S390_CCW_MACHINE, false, NULL); =20 - if (!kvm_check_extension(kvm_state, KVM_CAP_DEVICE_CTRL)) { - error_report("KVM is missing capability KVM_CAP_DEVICE_CTRL - " - "please use kernel 3.15 or newer"); - return -1; - } if (!kvm_check_extension(s, KVM_CAP_S390_COW)) { error_report("KVM is missing capability KVM_CAP_S390_COW - " "unsupported environment"); return -1; } =20 - cap_sync_regs =3D kvm_check_extension(s, KVM_CAP_SYNC_REGS); cap_async_pf =3D kvm_check_extension(s, KVM_CAP_ASYNC_PF); cap_mem_op =3D kvm_check_extension(s, KVM_CAP_S390_MEM_OP); cap_mem_op_extension =3D kvm_check_extension(s, KVM_CAP_S390_MEM_OP_EX= TENSION); @@ -463,15 +469,15 @@ void kvm_s390_reset_vcpu_normal(S390CPU *cpu) =20 static int can_sync_regs(CPUState *cs, int regs) { - return cap_sync_regs && (cs->kvm_run->kvm_valid_regs & regs) =3D=3D re= gs; + return (cs->kvm_run->kvm_valid_regs & regs) =3D=3D regs; } =20 int kvm_arch_put_registers(CPUState *cs, int level) { + const int required_syncs =3D KVM_SYNC_GPRS | KVM_SYNC_ACRS | + KVM_SYNC_CRS | KVM_SYNC_PREFIX; S390CPU *cpu =3D S390_CPU(cs); CPUS390XState *env =3D &cpu->env; - struct kvm_sregs sregs; - struct kvm_regs regs; struct kvm_fpu fpu =3D {}; int r; int i; @@ -480,21 +486,16 @@ int kvm_arch_put_registers(CPUState *cs, int level) cs->kvm_run->psw_addr =3D env->psw.addr; cs->kvm_run->psw_mask =3D env->psw.mask; =20 - if (can_sync_regs(cs, KVM_SYNC_GPRS)) { - for (i =3D 0; i < 16; i++) { - cs->kvm_run->s.regs.gprs[i] =3D env->regs[i]; - cs->kvm_run->kvm_dirty_regs |=3D KVM_SYNC_GPRS; - } - } else { - for (i =3D 0; i < 16; i++) { - regs.gprs[i] =3D env->regs[i]; - } - r =3D kvm_vcpu_ioctl(cs, KVM_SET_REGS, ®s); - if (r < 0) { - return r; - } + g_assert((cs->kvm_run->kvm_valid_regs & required_syncs) =3D=3D require= d_syncs); + cs->kvm_run->kvm_dirty_regs |=3D required_syncs; + for (i =3D 0; i < 16; i++) { + cs->kvm_run->s.regs.gprs[i] =3D env->regs[i]; + cs->kvm_run->s.regs.acrs[i] =3D env->aregs[i]; + cs->kvm_run->s.regs.crs[i] =3D env->cregs[i]; } =20 + cs->kvm_run->s.regs.prefix =3D env->psa; + if (can_sync_regs(cs, KVM_SYNC_VRS)) { for (i =3D 0; i < 32; i++) { cs->kvm_run->s.regs.vrs[i][0] =3D env->vregs[i][0]; @@ -572,25 +573,6 @@ int kvm_arch_put_registers(CPUState *cs, int level) } } =20 - /* access registers and control registers*/ - if (can_sync_regs(cs, KVM_SYNC_ACRS | KVM_SYNC_CRS)) { - for (i =3D 0; i < 16; i++) { - cs->kvm_run->s.regs.acrs[i] =3D env->aregs[i]; - cs->kvm_run->s.regs.crs[i] =3D env->cregs[i]; - } - cs->kvm_run->kvm_dirty_regs |=3D KVM_SYNC_ACRS; - cs->kvm_run->kvm_dirty_regs |=3D KVM_SYNC_CRS; - } else { - for (i =3D 0; i < 16; i++) { - sregs.acrs[i] =3D env->aregs[i]; - sregs.crs[i] =3D env->cregs[i]; - } - r =3D kvm_vcpu_ioctl(cs, KVM_SET_SREGS, &sregs); - if (r < 0) { - return r; - } - } - if (can_sync_regs(cs, KVM_SYNC_GSCB)) { memcpy(cs->kvm_run->s.regs.gscb, env->gscb, 32); cs->kvm_run->kvm_dirty_regs |=3D KVM_SYNC_GSCB; @@ -612,22 +594,15 @@ int kvm_arch_put_registers(CPUState *cs, int level) cs->kvm_run->kvm_dirty_regs |=3D KVM_SYNC_DIAG318; } =20 - /* Finally the prefix */ - if (can_sync_regs(cs, KVM_SYNC_PREFIX)) { - cs->kvm_run->s.regs.prefix =3D env->psa; - cs->kvm_run->kvm_dirty_regs |=3D KVM_SYNC_PREFIX; - } else { - /* prefix is only supported via sync regs */ - } return 0; } =20 int kvm_arch_get_registers(CPUState *cs) { + const int required_syncs =3D KVM_SYNC_GPRS | KVM_SYNC_ACRS | + KVM_SYNC_CRS | KVM_SYNC_PREFIX; S390CPU *cpu =3D S390_CPU(cs); CPUS390XState *env =3D &cpu->env; - struct kvm_sregs sregs; - struct kvm_regs regs; struct kvm_fpu fpu; int i, r; =20 @@ -635,37 +610,16 @@ int kvm_arch_get_registers(CPUState *cs) env->psw.addr =3D cs->kvm_run->psw_addr; env->psw.mask =3D cs->kvm_run->psw_mask; =20 - /* the GPRS */ - if (can_sync_regs(cs, KVM_SYNC_GPRS)) { - for (i =3D 0; i < 16; i++) { - env->regs[i] =3D cs->kvm_run->s.regs.gprs[i]; - } - } else { - r =3D kvm_vcpu_ioctl(cs, KVM_GET_REGS, ®s); - if (r < 0) { - return r; - } - for (i =3D 0; i < 16; i++) { - env->regs[i] =3D regs.gprs[i]; - } + /* the GPRS, ACRS and CRS */ + g_assert((cs->kvm_run->kvm_valid_regs & required_syncs) =3D=3D require= d_syncs); + for (i =3D 0; i < 16; i++) { + env->regs[i] =3D cs->kvm_run->s.regs.gprs[i]; + env->aregs[i] =3D cs->kvm_run->s.regs.acrs[i]; + env->cregs[i] =3D cs->kvm_run->s.regs.crs[i]; } =20 - /* The ACRS and CRS */ - if (can_sync_regs(cs, KVM_SYNC_ACRS | KVM_SYNC_CRS)) { - for (i =3D 0; i < 16; i++) { - env->aregs[i] =3D cs->kvm_run->s.regs.acrs[i]; - env->cregs[i] =3D cs->kvm_run->s.regs.crs[i]; - } - } else { - r =3D kvm_vcpu_ioctl(cs, KVM_GET_SREGS, &sregs); - if (r < 0) { - return r; - } - for (i =3D 0; i < 16; i++) { - env->aregs[i] =3D sregs.acrs[i]; - env->cregs[i] =3D sregs.crs[i]; - } - } + /* The prefix */ + env->psa =3D cs->kvm_run->s.regs.prefix; =20 /* Floating point and vector registers */ if (can_sync_regs(cs, KVM_SYNC_VRS)) { @@ -690,11 +644,6 @@ int kvm_arch_get_registers(CPUState *cs) env->fpc =3D fpu.fpc; } =20 - /* The prefix */ - if (can_sync_regs(cs, KVM_SYNC_PREFIX)) { - env->psa =3D cs->kvm_run->s.regs.prefix; - } - if (can_sync_regs(cs, KVM_SYNC_ARCH0)) { env->cputm =3D cs->kvm_run->s.regs.cputm; env->ckc =3D cs->kvm_run->s.regs.ckc; --=20 2.39.3