From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E83C4C83F11 for ; Mon, 28 Aug 2023 18:20:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qagqi-0004YW-R3; Mon, 28 Aug 2023 14:20:29 -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 1qagqe-0004Y5-Pa for qemu-devel@nongnu.org; Mon, 28 Aug 2023 14:20:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qagqa-0003Q3-PT for qemu-devel@nongnu.org; Mon, 28 Aug 2023 14:20:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693246819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dkeT3zq2tAGJ5tPC/UNogsvqz4VzixI1LPmFTcF7jz0=; b=Eg7TJLVS2VfCL4zoCuK4YLXE35PXLb3EvWfWaTdyd1BuCkCt1mv1m50ot8smjhohWMP4mV W0JX+PTuI1j0eXdspLf+aaOcmCs6TCn2V7yiCNumnZFr6hVj2iZv6RNaE2/g9shoyjaasf GxnN1IKly35C3oDpouoHtG+CgalL8no= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-547-zAGYNEF6MRCF7BQ9R52_bQ-1; Mon, 28 Aug 2023 14:20:17 -0400 X-MC-Unique: zAGYNEF6MRCF7BQ9R52_bQ-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-3fefc7845a2so24607165e9.1 for ; Mon, 28 Aug 2023 11:20:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693246816; x=1693851616; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dkeT3zq2tAGJ5tPC/UNogsvqz4VzixI1LPmFTcF7jz0=; b=Up/nB388Cpk/Wq3Fc7bzE4K57sakLqxpO4tF5l4P6ei+ne5LaoqfsDYvOkGbNtbBD+ M4+Aon/JYdsQhnmjLlRjyDOIgOCSMKJW34AGmQVYFn3egvVQaoK1Zcl55tE41zYtZe0J sLLON0hi56SeMubVLZE2KNFtsw7cG9m1g7BnJtqISvBvLFSzByNdwNj+hVngfFYaSCGS hb+yEQlMxpbR46kgmvts3XMqfygbkk3lDUea2VYI+l4supzbxPb4bAdepAyG1/ZLiWLt n1sFQLF6QxWz4mAy9SdN4Ml0VLtZz6BYFZrx9+WsRrRu5YoksiVKVsArhrPYCtAfgeP9 RF7A== X-Gm-Message-State: AOJu0YyhKsrd/IY1XU/Vw7Lsdgh7Zt8D4bVfBVRMgkyXSABhIRviMdrG 2x0jJHXlSlgJXQPmO7FI80ohuMJBqS4AyLzsR/fU+GHS7T4YXS57DK0A++ZuThcYV7FRoIMREWM uPelPnR12PQ7ofgJCxEmB0bth6w== X-Received: by 2002:a1c:6a17:0:b0:401:b701:5424 with SMTP id f23-20020a1c6a17000000b00401b7015424mr6792908wmc.9.1693246816455; Mon, 28 Aug 2023 11:20:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHIhwG+FY7dDnjarQHpX0rx36os0k31tB2yqGW2KbKaCt0lNO2WKocok28kR3tspczlESCtQA== X-Received: by 2002:a1c:6a17:0:b0:401:b701:5424 with SMTP id f23-20020a1c6a17000000b00401b7015424mr6792892wmc.9.1693246816083; Mon, 28 Aug 2023 11:20:16 -0700 (PDT) Received: from [192.168.8.103] (tmo-098-91.customers.d1-online.com. [80.187.98.91]) by smtp.gmail.com with ESMTPSA id n15-20020a7bcbcf000000b003fc02e8ea68sm14657662wmi.13.2023.08.28.11.20.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 28 Aug 2023 11:20:15 -0700 (PDT) Message-ID: <1b3db0fa-3d63-1f94-838d-cd75baf67431@redhat.com> Date: Mon, 28 Aug 2023 20:20:13 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH for-8.2] target/s390x/kvm: Simplify the GPRs, ACRs, CRs and prefix synchronization code Content-Language: en-US From: Thomas Huth To: qemu-s390x@nongnu.org, Halil Pasic , Christian Borntraeger Cc: qemu-devel@nongnu.org, David Hildenbrand , Cedric Le Goater , Janosch Frank , Claudio Imbrenda , Matthew Rosato , Nico Boehr References: <20230814190604.907982-1-thuth@redhat.com> In-Reply-To: <20230814190604.907982-1-thuth@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 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, NICE_REPLY_A=-2.169, 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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 14/08/2023 21.06, Thomas Huth wrote: > 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(-) Ping! Anybody any comments on this one? Thomas > 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[] = { > KVM_CAP_LAST_INFO > }; > > -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) > > int kvm_arch_init(MachineState *ms, KVMState *s) > { > + int required_caps[] = { > + KVM_CAP_DEVICE_CTRL, > + KVM_CAP_SYNC_REGS, > + }; > + > + for (int i = 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); > > - 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; > } > > - cap_sync_regs = kvm_check_extension(s, KVM_CAP_SYNC_REGS); > cap_async_pf = kvm_check_extension(s, KVM_CAP_ASYNC_PF); > cap_mem_op = kvm_check_extension(s, KVM_CAP_S390_MEM_OP); > cap_mem_op_extension = kvm_check_extension(s, KVM_CAP_S390_MEM_OP_EXTENSION); > @@ -463,15 +469,15 @@ void kvm_s390_reset_vcpu_normal(S390CPU *cpu) > > static int can_sync_regs(CPUState *cs, int regs) > { > - return cap_sync_regs && (cs->kvm_run->kvm_valid_regs & regs) == regs; > + return (cs->kvm_run->kvm_valid_regs & regs) == regs; > } > > int kvm_arch_put_registers(CPUState *cs, int level) > { > + const int required_syncs = KVM_SYNC_GPRS | KVM_SYNC_ACRS | > + KVM_SYNC_CRS | KVM_SYNC_PREFIX; > S390CPU *cpu = S390_CPU(cs); > CPUS390XState *env = &cpu->env; > - struct kvm_sregs sregs; > - struct kvm_regs regs; > struct kvm_fpu fpu = {}; > int r; > int i; > @@ -480,21 +486,16 @@ int kvm_arch_put_registers(CPUState *cs, int level) > cs->kvm_run->psw_addr = env->psw.addr; > cs->kvm_run->psw_mask = env->psw.mask; > > - if (can_sync_regs(cs, KVM_SYNC_GPRS)) { > - for (i = 0; i < 16; i++) { > - cs->kvm_run->s.regs.gprs[i] = env->regs[i]; > - cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_GPRS; > - } > - } else { > - for (i = 0; i < 16; i++) { > - regs.gprs[i] = env->regs[i]; > - } > - r = kvm_vcpu_ioctl(cs, KVM_SET_REGS, ®s); > - if (r < 0) { > - return r; > - } > + g_assert((cs->kvm_run->kvm_valid_regs & required_syncs) == required_syncs); > + cs->kvm_run->kvm_dirty_regs |= required_syncs; > + for (i = 0; i < 16; i++) { > + cs->kvm_run->s.regs.gprs[i] = env->regs[i]; > + cs->kvm_run->s.regs.acrs[i] = env->aregs[i]; > + cs->kvm_run->s.regs.crs[i] = env->cregs[i]; > } > > + cs->kvm_run->s.regs.prefix = env->psa; > + > if (can_sync_regs(cs, KVM_SYNC_VRS)) { > for (i = 0; i < 32; i++) { > cs->kvm_run->s.regs.vrs[i][0] = env->vregs[i][0]; > @@ -572,25 +573,6 @@ int kvm_arch_put_registers(CPUState *cs, int level) > } > } > > - /* access registers and control registers*/ > - if (can_sync_regs(cs, KVM_SYNC_ACRS | KVM_SYNC_CRS)) { > - for (i = 0; i < 16; i++) { > - cs->kvm_run->s.regs.acrs[i] = env->aregs[i]; > - cs->kvm_run->s.regs.crs[i] = env->cregs[i]; > - } > - cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_ACRS; > - cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_CRS; > - } else { > - for (i = 0; i < 16; i++) { > - sregs.acrs[i] = env->aregs[i]; > - sregs.crs[i] = env->cregs[i]; > - } > - r = 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 |= KVM_SYNC_GSCB; > @@ -612,22 +594,15 @@ int kvm_arch_put_registers(CPUState *cs, int level) > cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_DIAG318; > } > > - /* Finally the prefix */ > - if (can_sync_regs(cs, KVM_SYNC_PREFIX)) { > - cs->kvm_run->s.regs.prefix = env->psa; > - cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_PREFIX; > - } else { > - /* prefix is only supported via sync regs */ > - } > return 0; > } > > int kvm_arch_get_registers(CPUState *cs) > { > + const int required_syncs = KVM_SYNC_GPRS | KVM_SYNC_ACRS | > + KVM_SYNC_CRS | KVM_SYNC_PREFIX; > S390CPU *cpu = S390_CPU(cs); > CPUS390XState *env = &cpu->env; > - struct kvm_sregs sregs; > - struct kvm_regs regs; > struct kvm_fpu fpu; > int i, r; > > @@ -635,37 +610,16 @@ int kvm_arch_get_registers(CPUState *cs) > env->psw.addr = cs->kvm_run->psw_addr; > env->psw.mask = cs->kvm_run->psw_mask; > > - /* the GPRS */ > - if (can_sync_regs(cs, KVM_SYNC_GPRS)) { > - for (i = 0; i < 16; i++) { > - env->regs[i] = cs->kvm_run->s.regs.gprs[i]; > - } > - } else { > - r = kvm_vcpu_ioctl(cs, KVM_GET_REGS, ®s); > - if (r < 0) { > - return r; > - } > - for (i = 0; i < 16; i++) { > - env->regs[i] = regs.gprs[i]; > - } > + /* the GPRS, ACRS and CRS */ > + g_assert((cs->kvm_run->kvm_valid_regs & required_syncs) == required_syncs); > + for (i = 0; i < 16; i++) { > + env->regs[i] = cs->kvm_run->s.regs.gprs[i]; > + env->aregs[i] = cs->kvm_run->s.regs.acrs[i]; > + env->cregs[i] = cs->kvm_run->s.regs.crs[i]; > } > > - /* The ACRS and CRS */ > - if (can_sync_regs(cs, KVM_SYNC_ACRS | KVM_SYNC_CRS)) { > - for (i = 0; i < 16; i++) { > - env->aregs[i] = cs->kvm_run->s.regs.acrs[i]; > - env->cregs[i] = cs->kvm_run->s.regs.crs[i]; > - } > - } else { > - r = kvm_vcpu_ioctl(cs, KVM_GET_SREGS, &sregs); > - if (r < 0) { > - return r; > - } > - for (i = 0; i < 16; i++) { > - env->aregs[i] = sregs.acrs[i]; > - env->cregs[i] = sregs.crs[i]; > - } > - } > + /* The prefix */ > + env->psa = cs->kvm_run->s.regs.prefix; > > /* 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 = fpu.fpc; > } > > - /* The prefix */ > - if (can_sync_regs(cs, KVM_SYNC_PREFIX)) { > - env->psa = cs->kvm_run->s.regs.prefix; > - } > - > if (can_sync_regs(cs, KVM_SYNC_ARCH0)) { > env->cputm = cs->kvm_run->s.regs.cputm; > env->ckc = cs->kvm_run->s.regs.ckc;