From nobody Mon Apr 6 23:17:58 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773755209; cv=none; d=zohomail.com; s=zohoarc; b=cxcS+jyKjWGXVYCMNR/rhdUHIfmZYJm1xmTSRYYw+8Lp+WL11C0K1Yg93gPlDP+raIBSi8/EDEXxuBTd3yTZl6ErvBVS/nRpEZNHgpVXDEFi3pEFYTFAvT2rO97VfRvt6A8T+HnuJkluKsdUeIdGddnagHj1qAHFEyLYlEdHcsU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773755209; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lys7VOyfNTjp26JU3AKpoNwt7DRQisJ+bYtC2Aif6/Y=; b=C9fAmL2R7LGotJ3xD1Nx3fnsejcVXVqjHcrWdZvzcW4R+6jjqwOFD8hBbZMWVIIkLAQRACs+0AmUmR0Xtu02S3Wc4WI14pT7J041mdXPoY5O7sOS5Qk/uyHKz2CQMKAYSz1wkIneo65iNDaZW2XQ11emXmb38iBfwZVlGvPz5EE= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773755209770137.0879083883276; Tue, 17 Mar 2026 06:46:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2Uk1-0007or-SY; Tue, 17 Mar 2026 09:45:50 -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 1w2Ujx-0007mP-56 for qemu-devel@nongnu.org; Tue, 17 Mar 2026 09:45:45 -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 1w2Ujv-0002Bj-Bv for qemu-devel@nongnu.org; Tue, 17 Mar 2026 09:45:44 -0400 Received: from mx-prod-mc-01.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-367-9pzy2lAOPs6qXJZ-1dlkWw-1; Tue, 17 Mar 2026 09:45:38 -0400 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E78CB19560B5; Tue, 17 Mar 2026 13:45:36 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.32.37]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9145319560B1; Tue, 17 Mar 2026 13:45:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773755141; 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=lys7VOyfNTjp26JU3AKpoNwt7DRQisJ+bYtC2Aif6/Y=; b=CMZKMv9u9VlcviyA33hHX9aG+/MEA767qdSIYngObZBEv94g6df2uCkaaJmeUn/oqOk3/g hrkhXvrkqntWa/lViw67HTHPMrNCmcDmE7qbkKA9XKxvRX0LtyabGA0cqcnCU/hIp6voW1 g0kyB9k1KE+UdKNUVhwHRpkrYJd8zZw= X-MC-Unique: 9pzy2lAOPs6qXJZ-1dlkWw-1 X-Mimecast-MFC-AGG-ID: 9pzy2lAOPs6qXJZ-1dlkWw_1773755137 From: Thomas Huth To: Halil Pasic , Christian Borntraeger , Cornelia Huck , qemu-devel@nongnu.org Cc: Eric Farman , Matthew Rosato , qemu-s390x@nongnu.org Subject: [PATCH] target/s390x/kvm: Simplify the async pfault handling code Date: Tue, 17 Mar 2026 14:45:31 +0100 Message-ID: <20260317134531.460141-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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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 development 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: 1773755211060158500 Content-Type: text/plain; charset="utf-8" From: Thomas Huth Since commit 126e7f78036 ("kvm: require KVM_CAP_IOEVENTFD and KVM_CAP_IOEVENTFD_ANY_LENGTH") we require at least kernel v4.4 to be able to use KVM. KVM_CAP_ASYNC_PF is available in the kernel since v3.15 and KVM_SYNC_PFAULT is available since kernel v3.18, so we can assume now that they are available in all supported kernels. Thus simplify the code a little bit by removing the checks for these features. Signed-off-by: Thomas Huth Acked-by: Christian Borntraeger Reviewed-by: Eric Farman Reviewed-by: Matthew Rosato --- I just found this old patch on one of my local branches ... seems like I forgot to send it out after writing it last year... target/s390x/kvm/kvm.c | 52 +++++++++--------------------------------- 1 file changed, 11 insertions(+), 41 deletions(-) diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c index 54d28e37d4d..133e8c12fd4 100644 --- a/target/s390x/kvm/kvm.c +++ b/target/s390x/kvm/kvm.c @@ -140,7 +140,6 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[= ] =3D { KVM_CAP_LAST_INFO }; =20 -static int cap_async_pf; static int cap_mem_op; static int cap_mem_op_extension; static int cap_s390_irq; @@ -333,6 +332,7 @@ int kvm_arch_get_default_type(MachineState *ms) int kvm_arch_init(MachineState *ms, KVMState *s) { int required_caps[] =3D { + KVM_CAP_ASYNC_PF, KVM_CAP_DEVICE_CTRL, KVM_CAP_SYNC_REGS, }; @@ -340,7 +340,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) 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]); + "please use kernel 4.4 or newer", required_caps[i= ]); return -1; } } @@ -354,7 +354,6 @@ int kvm_arch_init(MachineState *ms, KVMState *s) return -1; } =20 - 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); mem_op_storage_key_support =3D cap_mem_op_extension > 0; @@ -466,7 +465,8 @@ static int can_sync_regs(CPUState *cs, int regs) } =20 #define KVM_SYNC_REQUIRED_REGS (KVM_SYNC_GPRS | KVM_SYNC_ACRS | \ - KVM_SYNC_CRS | KVM_SYNC_PREFIX) + KVM_SYNC_CRS | KVM_SYNC_PREFIX | \ + KVM_SYNC_PFAULT) =20 int kvm_arch_put_registers(CPUState *cs, KvmPutState level, Error **errp) { @@ -550,25 +550,10 @@ int kvm_arch_put_registers(CPUState *cs, KvmPutState = level, Error **errp) } =20 /* pfault parameters */ - if (can_sync_regs(cs, KVM_SYNC_PFAULT)) { - cs->kvm_run->s.regs.pft =3D env->pfault_token; - cs->kvm_run->s.regs.pfs =3D env->pfault_select; - cs->kvm_run->s.regs.pfc =3D env->pfault_compare; - cs->kvm_run->kvm_dirty_regs |=3D KVM_SYNC_PFAULT; - } else if (cap_async_pf) { - r =3D kvm_set_one_reg(cs, KVM_REG_S390_PFTOKEN, &env->pfault_token= ); - if (r < 0) { - return r; - } - r =3D kvm_set_one_reg(cs, KVM_REG_S390_PFCOMPARE, &env->pfault_com= pare); - if (r < 0) { - return r; - } - r =3D kvm_set_one_reg(cs, KVM_REG_S390_PFSELECT, &env->pfault_sele= ct); - if (r < 0) { - return r; - } - } + cs->kvm_run->s.regs.pft =3D env->pfault_token; + cs->kvm_run->s.regs.pfs =3D env->pfault_select; + cs->kvm_run->s.regs.pfc =3D env->pfault_compare; + cs->kvm_run->kvm_dirty_regs |=3D KVM_SYNC_PFAULT; =20 if (can_sync_regs(cs, KVM_SYNC_GSCB)) { memcpy(cs->kvm_run->s.regs.gscb, env->gscb, 32); @@ -673,24 +658,9 @@ int kvm_arch_get_registers(CPUState *cs, Error **errp) } =20 /* pfault parameters */ - if (can_sync_regs(cs, KVM_SYNC_PFAULT)) { - env->pfault_token =3D cs->kvm_run->s.regs.pft; - env->pfault_select =3D cs->kvm_run->s.regs.pfs; - env->pfault_compare =3D cs->kvm_run->s.regs.pfc; - } else if (cap_async_pf) { - r =3D kvm_get_one_reg(cs, KVM_REG_S390_PFTOKEN, &env->pfault_token= ); - if (r < 0) { - return r; - } - r =3D kvm_get_one_reg(cs, KVM_REG_S390_PFCOMPARE, &env->pfault_com= pare); - if (r < 0) { - return r; - } - r =3D kvm_get_one_reg(cs, KVM_REG_S390_PFSELECT, &env->pfault_sele= ct); - if (r < 0) { - return r; - } - } + env->pfault_token =3D cs->kvm_run->s.regs.pft; + env->pfault_select =3D cs->kvm_run->s.regs.pfs; + env->pfault_compare =3D cs->kvm_run->s.regs.pfc; =20 if (can_sync_regs(cs, KVM_SYNC_DIAG318)) { env->diag318_info =3D cs->kvm_run->s.regs.diag318; --=20 2.53.0