{"id":1850807,"url":"http://patchwork.ozlabs.org/api/patches/1850807/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20231018130716.286638-25-thuth@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20231018130716.286638-25-thuth@redhat.com>","list_archive_url":null,"date":"2023-10-18T13:07:15","name":"[PULL,24/25] target/s390x/kvm: Simplify the GPRs, ACRs, CRs and prefix synchronization code","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b90afec824fe64d835c6dc18afdde40013b53e37","submitter":{"id":66152,"url":"http://patchwork.ozlabs.org/api/people/66152/?format=json","name":"Thomas Huth","email":"thuth@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20231018130716.286638-25-thuth@redhat.com/mbox/","series":[{"id":378180,"url":"http://patchwork.ozlabs.org/api/series/378180/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=378180","date":"2023-10-18T13:06:52","name":"[PULL,01/25] qapi: machine.json: change docs regarding CPU topology","version":1,"mbox":"http://patchwork.ozlabs.org/series/378180/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1850807/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1850807/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=C0ms0ALY;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4S9WRx5zzFz20cx\n\tfor ; Thu, 19 Oct 2023 00:10:37 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1qt6IH-0006vP-BF; Wed, 18 Oct 2023 09:09:01 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1qt6HR-0004Yn-CZ\n for qemu-devel@nongnu.org; Wed, 18 Oct 2023 09:08:12 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1qt6HO-00082S-D3\n for qemu-devel@nongnu.org; Wed, 18 Oct 2023 09:08:09 -0400","from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])\n by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-371-4KV0oM2hNPOuaviaQaH4qQ-1; Wed, 18 Oct 2023 09:08:00 -0400","from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com\n [10.11.54.4])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D15BC1DD35E4;\n Wed, 18 Oct 2023 13:07:59 +0000 (UTC)","from thuth-p1g4.redhat.com (unknown [10.39.192.109])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 8593620268C8;\n Wed, 18 Oct 2023 13:07:58 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1697634483;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=yj9gQaLJTWM6hnSDXKzT3FnPrtISxGk/IFyB5lGZKQg=;\n b=C0ms0ALYPIEyMSrbyI+I7NqKn7+pAPNkuD5uLqA06dO12I9Ee8+hKkA6tAXC268EgTxhqF\n p9cKF1FRv+z61vHYdGPQIwDOqc/qK6Ocvuox3t+3Wjh9CrqXH3cuvl6YEuSLd9oXrWt47z\n JB366lphJGpwo+PhZ+J7hy9xDBjHwdM=","X-MC-Unique":"4KV0oM2hNPOuaviaQaH4qQ-1","From":"Thomas Huth ","To":"qemu-devel@nongnu.org","Cc":"Stefan Hajnoczi , qemu-s390x@nongnu.org,\n Nina Schoetterl-Glausch ","Subject":"[PULL 24/25] target/s390x/kvm: Simplify the GPRs, ACRs,\n CRs and prefix synchronization code","Date":"Wed, 18 Oct 2023 15:07:15 +0200","Message-ID":"<20231018130716.286638-25-thuth@redhat.com>","In-Reply-To":"<20231018130716.286638-1-thuth@redhat.com>","References":"<20231018130716.286638-1-thuth@redhat.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.4.1 on 10.11.54.4","Received-SPF":"pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com;\n 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,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"KVM_SYNC_GPRS, KVM_SYNC_ACRS, KVM_SYNC_CRS and KVM_SYNC_PREFIX are\navailable since kernel 3.10. Since we already require at least kernel\n3.15 in the s390x KVM code, we can also assume that the KVM_CAP_SYNC_REGS\nsync code is always possible for these registers, and remove the\nrelated checks and fallbacks via KVM_SET_REGS and KVM_GET_REGS.\n\nMessage-ID: <20231011080538.796999-3-thuth@redhat.com>\nSigned-off-by: Thomas Huth \n---\n target/s390x/kvm/kvm.c | 106 ++++++++++-------------------------------\n 1 file changed, 24 insertions(+), 82 deletions(-)","diff":"diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c\nindex 068e9826e1..0f0e784b2a 100644\n--- a/target/s390x/kvm/kvm.c\n+++ b/target/s390x/kvm/kvm.c\n@@ -139,7 +139,6 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = {\n KVM_CAP_LAST_INFO\n };\n \n-static int cap_sync_regs;\n static int cap_async_pf;\n static int cap_mem_op;\n static int cap_mem_op_extension;\n@@ -360,7 +359,6 @@ int kvm_arch_init(MachineState *ms, KVMState *s)\n return -1;\n }\n \n- cap_sync_regs = true;\n cap_async_pf = kvm_check_extension(s, KVM_CAP_ASYNC_PF);\n cap_mem_op = kvm_check_extension(s, KVM_CAP_S390_MEM_OP);\n cap_mem_op_extension = kvm_check_extension(s, KVM_CAP_S390_MEM_OP_EXTENSION);\n@@ -468,37 +466,28 @@ void kvm_s390_reset_vcpu_normal(S390CPU *cpu)\n \n static int can_sync_regs(CPUState *cs, int regs)\n {\n- return cap_sync_regs && (cs->kvm_run->kvm_valid_regs & regs) == regs;\n+ return (cs->kvm_run->kvm_valid_regs & regs) == regs;\n }\n \n+#define KVM_SYNC_REQUIRED_REGS (KVM_SYNC_GPRS | KVM_SYNC_ACRS | \\\n+ KVM_SYNC_CRS | KVM_SYNC_PREFIX)\n+\n int kvm_arch_put_registers(CPUState *cs, int level)\n {\n S390CPU *cpu = S390_CPU(cs);\n CPUS390XState *env = &cpu->env;\n- struct kvm_sregs sregs;\n- struct kvm_regs regs;\n struct kvm_fpu fpu = {};\n int r;\n int i;\n \n+ g_assert(can_sync_regs(cs, KVM_SYNC_REQUIRED_REGS));\n+\n /* always save the PSW and the GPRS*/\n cs->kvm_run->psw_addr = env->psw.addr;\n cs->kvm_run->psw_mask = env->psw.mask;\n \n- if (can_sync_regs(cs, KVM_SYNC_GPRS)) {\n- for (i = 0; i < 16; i++) {\n- cs->kvm_run->s.regs.gprs[i] = env->regs[i];\n- cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_GPRS;\n- }\n- } else {\n- for (i = 0; i < 16; i++) {\n- regs.gprs[i] = env->regs[i];\n- }\n- r = kvm_vcpu_ioctl(cs, KVM_SET_REGS, ®s);\n- if (r < 0) {\n- return r;\n- }\n- }\n+ memcpy(cs->kvm_run->s.regs.gprs, env->regs, sizeof(cs->kvm_run->s.regs.gprs));\n+ cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_GPRS;\n \n if (can_sync_regs(cs, KVM_SYNC_VRS)) {\n for (i = 0; i < 32; i++) {\n@@ -531,6 +520,15 @@ int kvm_arch_put_registers(CPUState *cs, int level)\n return 0;\n }\n \n+ /*\n+ * Access registers, control registers and the prefix - these are\n+ * always available via kvm_sync_regs in the kernels that we support\n+ */\n+ memcpy(cs->kvm_run->s.regs.acrs, env->aregs, sizeof(cs->kvm_run->s.regs.acrs));\n+ memcpy(cs->kvm_run->s.regs.crs, env->cregs, sizeof(cs->kvm_run->s.regs.crs));\n+ cs->kvm_run->s.regs.prefix = env->psa;\n+ cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_ACRS | KVM_SYNC_CRS | KVM_SYNC_PREFIX;\n+\n if (can_sync_regs(cs, KVM_SYNC_ARCH0)) {\n cs->kvm_run->s.regs.cputm = env->cputm;\n cs->kvm_run->s.regs.ckc = env->ckc;\n@@ -577,25 +575,6 @@ int kvm_arch_put_registers(CPUState *cs, int level)\n }\n }\n \n- /* access registers and control registers*/\n- if (can_sync_regs(cs, KVM_SYNC_ACRS | KVM_SYNC_CRS)) {\n- for (i = 0; i < 16; i++) {\n- cs->kvm_run->s.regs.acrs[i] = env->aregs[i];\n- cs->kvm_run->s.regs.crs[i] = env->cregs[i];\n- }\n- cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_ACRS;\n- cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_CRS;\n- } else {\n- for (i = 0; i < 16; i++) {\n- sregs.acrs[i] = env->aregs[i];\n- sregs.crs[i] = env->cregs[i];\n- }\n- r = kvm_vcpu_ioctl(cs, KVM_SET_SREGS, &sregs);\n- if (r < 0) {\n- return r;\n- }\n- }\n-\n if (can_sync_regs(cs, KVM_SYNC_GSCB)) {\n memcpy(cs->kvm_run->s.regs.gscb, env->gscb, 32);\n cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_GSCB;\n@@ -617,13 +596,6 @@ int kvm_arch_put_registers(CPUState *cs, int level)\n cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_DIAG318;\n }\n \n- /* Finally the prefix */\n- if (can_sync_regs(cs, KVM_SYNC_PREFIX)) {\n- cs->kvm_run->s.regs.prefix = env->psa;\n- cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_PREFIX;\n- } else {\n- /* prefix is only supported via sync regs */\n- }\n return 0;\n }\n \n@@ -631,8 +603,6 @@ int kvm_arch_get_registers(CPUState *cs)\n {\n S390CPU *cpu = S390_CPU(cs);\n CPUS390XState *env = &cpu->env;\n- struct kvm_sregs sregs;\n- struct kvm_regs regs;\n struct kvm_fpu fpu;\n int i, r;\n \n@@ -640,37 +610,14 @@ int kvm_arch_get_registers(CPUState *cs)\n env->psw.addr = cs->kvm_run->psw_addr;\n env->psw.mask = cs->kvm_run->psw_mask;\n \n- /* the GPRS */\n- if (can_sync_regs(cs, KVM_SYNC_GPRS)) {\n- for (i = 0; i < 16; i++) {\n- env->regs[i] = cs->kvm_run->s.regs.gprs[i];\n- }\n- } else {\n- r = kvm_vcpu_ioctl(cs, KVM_GET_REGS, ®s);\n- if (r < 0) {\n- return r;\n- }\n- for (i = 0; i < 16; i++) {\n- env->regs[i] = regs.gprs[i];\n- }\n- }\n+ /* the GPRS, ACRS and CRS */\n+ g_assert(can_sync_regs(cs, KVM_SYNC_REQUIRED_REGS));\n+ memcpy(env->regs, cs->kvm_run->s.regs.gprs, sizeof(env->regs));\n+ memcpy(env->aregs, cs->kvm_run->s.regs.acrs, sizeof(env->aregs));\n+ memcpy(env->cregs, cs->kvm_run->s.regs.crs, sizeof(env->cregs));\n \n- /* The ACRS and CRS */\n- if (can_sync_regs(cs, KVM_SYNC_ACRS | KVM_SYNC_CRS)) {\n- for (i = 0; i < 16; i++) {\n- env->aregs[i] = cs->kvm_run->s.regs.acrs[i];\n- env->cregs[i] = cs->kvm_run->s.regs.crs[i];\n- }\n- } else {\n- r = kvm_vcpu_ioctl(cs, KVM_GET_SREGS, &sregs);\n- if (r < 0) {\n- return r;\n- }\n- for (i = 0; i < 16; i++) {\n- env->aregs[i] = sregs.acrs[i];\n- env->cregs[i] = sregs.crs[i];\n- }\n- }\n+ /* The prefix */\n+ env->psa = cs->kvm_run->s.regs.prefix;\n \n /* Floating point and vector registers */\n if (can_sync_regs(cs, KVM_SYNC_VRS)) {\n@@ -695,11 +642,6 @@ int kvm_arch_get_registers(CPUState *cs)\n env->fpc = fpu.fpc;\n }\n \n- /* The prefix */\n- if (can_sync_regs(cs, KVM_SYNC_PREFIX)) {\n- env->psa = cs->kvm_run->s.regs.prefix;\n- }\n-\n if (can_sync_regs(cs, KVM_SYNC_ARCH0)) {\n env->cputm = cs->kvm_run->s.regs.cputm;\n env->ckc = cs->kvm_run->s.regs.ckc;\n","prefixes":["PULL","24/25"]}