From nobody Sat Nov 23 18:02:54 2024 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=1731951508; cv=none; d=zohomail.com; s=zohoarc; b=hjBkbWbQba/NkA1kq3xe8k/On4zpqTYw1BLshes4ECPXVo6h6uOR/YUmpzQTj4NOo8HJZ+zk6Mkjf716Y/dpm4MeWL3HtmaFLIqODntpwh7qouF4JWnC2gNqhV8z266BXAkwyibdeLFGmGZTVrkth86SzmQVkotfmg/H3cSG9n4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731951508; 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=hkzDv6uUFa/SZx2BOtVeB2b/N2Qd/jtqZGg5bLu+YqA=; b=Pxo5EOrcQg7UvqCNYZVbDMT08zKBTzbkba8q73092/ipEGjhyiEFg5UU9gO+HP36xbJ+JHF/q+t9SbRpk0o4JNEct7gWgIVcjGpvXXKMiHDKixa/V3T+ZjchkOEzGeOcsPYJ8jFWkgMi3HMwjn934nurDVV0kfcEj0pzby4XmwI= 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 1731951508313978.0772544583584; Mon, 18 Nov 2024 09:38:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tD5hD-0001lk-5P; Mon, 18 Nov 2024 12:37:55 -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 ) id 1tD5hB-0001bO-MZ for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:53 -0500 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 1tD5hA-00050U-6M for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:53 -0500 Received: from mx-prod-mc-04.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-312-vUE5Lk_lMOe-a1hOjQTg8g-1; Mon, 18 Nov 2024 12:36:43 -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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 120D21955BCF; Mon, 18 Nov 2024 17:36:41 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.53]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7507719560A3; Mon, 18 Nov 2024 17:36:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731951471; 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=hkzDv6uUFa/SZx2BOtVeB2b/N2Qd/jtqZGg5bLu+YqA=; b=flfzM5MzCUrllU4J/3LGnynt7MDBRIZg4c/u0uPqTTiT9ZRd3/NuMIiuJof8rcsOkeynXY rY2q8u0XDa2K448ZgqCYV3EVteyd8xFmGmJPvhBRAMsVjZm8mSH4KXNxFsNPZS48UsUvxN jIR4L0SnmS+iR50WETr964o5+c/sHL0= X-MC-Unique: vUE5Lk_lMOe-a1hOjQTg8g-1 X-Mimecast-MFC-AGG-ID: vUE5Lk_lMOe-a1hOjQTg8g From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Roque Arcudia Hernandez , Erwin Jansen , Pierrick Bouvier Subject: [PULL 01/12] hw/usb: Use __attribute__((packed)) vs __packed Date: Mon, 18 Nov 2024 18:36:23 +0100 Message-ID: <20241118173634.473532-2-thuth@redhat.com> In-Reply-To: <20241118173634.473532-1-thuth@redhat.com> References: <20241118173634.473532-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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.142, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1731951508968116600 Content-Type: text/plain; charset="utf-8" From: Roque Arcudia Hernandez __packed is non standard and is not present in clang-cl. __attribute__((packed)) has the same semantics. Signed-off-by: Erwin Jansen Signed-off-by: Roque Arcudia Hernandez Reviewed-by: Pierrick Bouvier Reviewed-by: Thomas Huth Message-ID: <20241101211720.3354111-1-roqueh@google.com> Signed-off-by: Thomas Huth --- include/hw/usb/dwc2-regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/usb/dwc2-regs.h b/include/hw/usb/dwc2-regs.h index 523b112c5e..b8b4266543 100644 --- a/include/hw/usb/dwc2-regs.h +++ b/include/hw/usb/dwc2-regs.h @@ -838,7 +838,7 @@ struct dwc2_dma_desc { uint32_t status; uint32_t buf; -} __packed; +} QEMU_PACKED; =20 /* Host Mode DMA descriptor status quadlet */ =20 --=20 2.47.0 From nobody Sat Nov 23 18:02:54 2024 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=1731951441; cv=none; d=zohomail.com; s=zohoarc; b=ESbet1H1SeYVN/5PGh8zp3v/7WcQx5MEiqoo4dJJW4Gdbun9v4Bg7Ca53DOWDpxE3h+KAW6kCVhYPUPdwxW+7kHDmslO+8aIrrlcqYJAn3lQXi7BvHVgnHvwKSciSVPxddxNj7VRu3deLfs1Pe8E/U5rK6ei7K5W5oyGljcc4o4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731951441; 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=U8ZF0tTQdZBir3IuexxqkPFkW2BBc2tfjP1VYb1K6jU=; b=fSuZdLcH5RnqcVnpw7IQZPcheGhCafYekihJp00/yTE9uTYI4VVZ6ijqSA0SnujL1ZDM2uvdTDEAdOLP3ouOsd4V1/guXcW9oZS3ZNNX4zmrkLMG+sENWW0cDTWB3oNnn6+fM2KITBc1AkFiKGgpVV5UHfcz2mKKztT/5+9UIC8= 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 1731951440920471.6083281699979; Mon, 18 Nov 2024 09:37:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tD5gO-0008CS-9K; Mon, 18 Nov 2024 12:37:04 -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 ) id 1tD5gE-00086w-0w for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:36:54 -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 ) id 1tD5gA-0004kq-VC for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:36:53 -0500 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-94-iAStWBGjNlCsKg_7jD0_LQ-1; Mon, 18 Nov 2024 12:36:45 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 61ACC1955D4D; Mon, 18 Nov 2024 17:36:43 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.53]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C9A69195DF81; Mon, 18 Nov 2024 17:36:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731951409; 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=U8ZF0tTQdZBir3IuexxqkPFkW2BBc2tfjP1VYb1K6jU=; b=JvIJO6TfnbIBWuyyLTGL8HWtgAgNe5UYtUOICEJkpgTLNDN0JjIHRG4o8mAJB/C4INFi0Y KkzRTjoXAOn+aGX/oXhkzUAX7fVs3un/yxuEL+eltO3wQ4uZn3l/iNQeskCrV83i8/b/Wg gJy1A4iDZdEWLkdFGDWLDulRygLrK0k= X-MC-Unique: iAStWBGjNlCsKg_7jD0_LQ-1 X-Mimecast-MFC-AGG-ID: iAStWBGjNlCsKg_7jD0_LQ From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Ilya Leoshkevich Subject: [PULL 02/12] target/s390x: Fix the floating-point multiply-and-add NaN rules Date: Mon, 18 Nov 2024 18:36:24 +0100 Message-ID: <20241118173634.473532-3-thuth@redhat.com> In-Reply-To: <20241118173634.473532-1-thuth@redhat.com> References: <20241118173634.473532-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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.142, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1731951442812116600 Content-Type: text/plain; charset="utf-8" From: Ilya Leoshkevich Order the helper arguments to match the Principles of Operation. Implement the "Results: MULTIPLY AND ADD" table in pickNaNMulAdd(). Reported-by: Peter Maydell Signed-off-by: Ilya Leoshkevich Reviewed-by: Peter Maydell Message-ID: <20241023000147.34035-2-iii@linux.ibm.com> Signed-off-by: Thomas Huth --- target/s390x/tcg/fpu_helper.c | 8 ++++---- target/s390x/tcg/vec_fpu_helper.c | 12 ++++++------ fpu/softfloat-specialize.c.inc | 19 +++++++++++++++++++ 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/target/s390x/tcg/fpu_helper.c b/target/s390x/tcg/fpu_helper.c index d8bd5748fa..5041c13962 100644 --- a/target/s390x/tcg/fpu_helper.c +++ b/target/s390x/tcg/fpu_helper.c @@ -780,7 +780,7 @@ uint32_t HELPER(kxb)(CPUS390XState *env, Int128 a, Int1= 28 b) uint64_t HELPER(maeb)(CPUS390XState *env, uint64_t f1, uint64_t f2, uint64_t f3) { - float32 ret =3D float32_muladd(f2, f3, f1, 0, &env->fpu_status); + float32 ret =3D float32_muladd(f3, f2, f1, 0, &env->fpu_status); handle_exceptions(env, false, GETPC()); return ret; } @@ -789,7 +789,7 @@ uint64_t HELPER(maeb)(CPUS390XState *env, uint64_t f1, uint64_t HELPER(madb)(CPUS390XState *env, uint64_t f1, uint64_t f2, uint64_t f3) { - float64 ret =3D float64_muladd(f2, f3, f1, 0, &env->fpu_status); + float64 ret =3D float64_muladd(f3, f2, f1, 0, &env->fpu_status); handle_exceptions(env, false, GETPC()); return ret; } @@ -798,7 +798,7 @@ uint64_t HELPER(madb)(CPUS390XState *env, uint64_t f1, uint64_t HELPER(mseb)(CPUS390XState *env, uint64_t f1, uint64_t f2, uint64_t f3) { - float32 ret =3D float32_muladd(f2, f3, f1, float_muladd_negate_c, + float32 ret =3D float32_muladd(f3, f2, f1, float_muladd_negate_c, &env->fpu_status); handle_exceptions(env, false, GETPC()); return ret; @@ -808,7 +808,7 @@ uint64_t HELPER(mseb)(CPUS390XState *env, uint64_t f1, uint64_t HELPER(msdb)(CPUS390XState *env, uint64_t f1, uint64_t f2, uint64_t f3) { - float64 ret =3D float64_muladd(f2, f3, f1, float_muladd_negate_c, + float64 ret =3D float64_muladd(f3, f2, f1, float_muladd_negate_c, &env->fpu_status); handle_exceptions(env, false, GETPC()); return ret; diff --git a/target/s390x/tcg/vec_fpu_helper.c b/target/s390x/tcg/vec_fpu_h= elper.c index 75cf605b9f..1bbaa82fe8 100644 --- a/target/s390x/tcg/vec_fpu_helper.c +++ b/target/s390x/tcg/vec_fpu_helper.c @@ -621,8 +621,8 @@ static void vfma32(S390Vector *v1, const S390Vector *v2= , const S390Vector *v3, int i; =20 for (i =3D 0; i < 4; i++) { - const float32 a =3D s390_vec_read_float32(v2, i); - const float32 b =3D s390_vec_read_float32(v3, i); + const float32 a =3D s390_vec_read_float32(v3, i); + const float32 b =3D s390_vec_read_float32(v2, i); const float32 c =3D s390_vec_read_float32(v4, i); float32 ret =3D float32_muladd(a, b, c, flags, &env->fpu_status); =20 @@ -645,8 +645,8 @@ static void vfma64(S390Vector *v1, const S390Vector *v2= , const S390Vector *v3, int i; =20 for (i =3D 0; i < 2; i++) { - const float64 a =3D s390_vec_read_float64(v2, i); - const float64 b =3D s390_vec_read_float64(v3, i); + const float64 a =3D s390_vec_read_float64(v3, i); + const float64 b =3D s390_vec_read_float64(v2, i); const float64 c =3D s390_vec_read_float64(v4, i); const float64 ret =3D float64_muladd(a, b, c, flags, &env->fpu_sta= tus); =20 @@ -664,8 +664,8 @@ static void vfma128(S390Vector *v1, const S390Vector *v= 2, const S390Vector *v3, const S390Vector *v4, CPUS390XState *env, bool s, int = flags, uintptr_t retaddr) { - const float128 a =3D s390_vec_read_float128(v2); - const float128 b =3D s390_vec_read_float128(v3); + const float128 a =3D s390_vec_read_float128(v3); + const float128 b =3D s390_vec_read_float128(v2); const float128 c =3D s390_vec_read_float128(v4); uint8_t vxc, vec_exc =3D 0; float128 ret; diff --git a/fpu/softfloat-specialize.c.inc b/fpu/softfloat-specialize.c.inc index b5a3208050..9bca03c4ae 100644 --- a/fpu/softfloat-specialize.c.inc +++ b/fpu/softfloat-specialize.c.inc @@ -597,6 +597,25 @@ static int pickNaNMulAdd(FloatClass a_cls, FloatClass = b_cls, FloatClass c_cls, float_raise(float_flag_invalid | float_flag_invalid_imz, status); } return 3; /* default NaN */ +#elif defined(TARGET_S390X) + if (infzero) { + float_raise(float_flag_invalid | float_flag_invalid_imz, status); + return 3; + } + + if (is_snan(a_cls)) { + return 0; + } else if (is_snan(b_cls)) { + return 1; + } else if (is_snan(c_cls)) { + return 2; + } else if (is_qnan(a_cls)) { + return 0; + } else if (is_qnan(b_cls)) { + return 1; + } else { + return 2; + } #elif defined(TARGET_SPARC) /* For (inf,0,nan) return c. */ if (infzero) { --=20 2.47.0 From nobody Sat Nov 23 18:02:54 2024 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=1731951456; cv=none; d=zohomail.com; s=zohoarc; b=fd77oIKxoZvl10OtKibGvGTYl8d6C/18dAyFnGZRtN9f33iQf+ZfiMxQ+0FxPIwmgS/SOAQZiJeiqcQS/8X1p/scZuooL0uEVDg+t/+Av6eh93xKmqKhuiOE/aHObLEtBljUOgVFpdxkX66F3eZ5GHJ/oFH4H/yaTz/g3nYS9pc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731951456; 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=wNLUg62WuuHx7X7vFu3U+pwB8WAA/7lyFpE5qq7HYOw=; b=GCS5swQUHAfttAIiIHR5odTY6GHslzIudOFmwcoXMFUSBm7eYdqZlUfuz9DNt5OHNAOm8d8MzruUu2HAdfZmGrWNiJsgOI28+ytE2Ym2W7ndhmappF6NlZs1INRiE9MDufrc1YHtb/a7TBWsft1dOSFTcOde5uHT29U0z4TVt2o= 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 1731951456005902.6510004463671; Mon, 18 Nov 2024 09:37:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tD5gQ-0008Em-KH; Mon, 18 Nov 2024 12:37:09 -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 ) id 1tD5gG-0008At-GF for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:00 -0500 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 1tD5gA-0004ks-Vl for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:36:56 -0500 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-683-bTC630sBMsObglrepPNjHw-1; Mon, 18 Nov 2024 12:36:47 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BB8E81954B02; Mon, 18 Nov 2024 17:36:46 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.53]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0D77B19560A3; Mon, 18 Nov 2024 17:36:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731951409; 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=wNLUg62WuuHx7X7vFu3U+pwB8WAA/7lyFpE5qq7HYOw=; b=iwMSNZMJtYQDrbPoCxW3A/c+m0qE4KDVDNP8NVaHLZ7Tgne6Brgp4Tcxdl4JIzK3WVmIpY UO+I5S5NMdigZ2E5GmbDyxNLvjRrd+ln0GG1Nibbrqo9QKURNd7uzb10oet6JqaM4P1X0F eLzo6omtfhwlNn+EWNd/iXttimW4ZzY= X-MC-Unique: bTC630sBMsObglrepPNjHw-1 X-Mimecast-MFC-AGG-ID: bTC630sBMsObglrepPNjHw From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Ilya Leoshkevich Subject: [PULL 03/12] tests/tcg/s390x: Add the floating-point multiply-and-add test Date: Mon, 18 Nov 2024 18:36:25 +0100 Message-ID: <20241118173634.473532-4-thuth@redhat.com> In-Reply-To: <20241118173634.473532-1-thuth@redhat.com> References: <20241118173634.473532-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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.142, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1731951456754116600 Content-Type: text/plain; charset="utf-8" From: Ilya Leoshkevich Add a test to prevent regressions. Share some useful pieces with the vfminmax test. Remove the duplicates from the floating point class values. Signed-off-by: Ilya Leoshkevich Reviewed-by: Peter Maydell Message-ID: <20241023000147.34035-3-iii@linux.ibm.com> Signed-off-by: Thomas Huth --- tests/tcg/s390x/float.h | 104 ++++++++++++++ tests/tcg/s390x/fma.c | 233 ++++++++++++++++++++++++++++++++ tests/tcg/s390x/vfminmax.c | 223 +++++++++++------------------- tests/tcg/s390x/Makefile.target | 5 +- 4 files changed, 420 insertions(+), 145 deletions(-) create mode 100644 tests/tcg/s390x/float.h create mode 100644 tests/tcg/s390x/fma.c diff --git a/tests/tcg/s390x/float.h b/tests/tcg/s390x/float.h new file mode 100644 index 0000000000..9d1682b8fc --- /dev/null +++ b/tests/tcg/s390x/float.h @@ -0,0 +1,104 @@ +/* + * Helpers for floating-point tests. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#ifndef FLOAT_H +#define FLOAT_H + +/* + * Floating-point value classes. + */ +#define N_FORMATS 3 +#define CLASS_MINUS_INF 0 +#define CLASS_MINUS_FN 1 +#define CLASS_MINUS_ZERO 2 +#define CLASS_PLUS_ZERO 3 +#define CLASS_PLUS_FN 4 +#define CLASS_PLUS_INF 5 +#define CLASS_QNAN 6 +#define CLASS_SNAN 7 +#define N_SIGNED_CLASSES 8 +static const size_t float_sizes[N_FORMATS] =3D { + /* M4 =3D=3D 2: short */ 4, + /* M4 =3D=3D 3: long */ 8, + /* M4 =3D=3D 4: extended */ 16, +}; +static const size_t e_bits[N_FORMATS] =3D { + /* M4 =3D=3D 2: short */ 8, + /* M4 =3D=3D 3: long */ 11, + /* M4 =3D=3D 4: extended */ 15, +}; +struct float_class { + size_t n; + unsigned char v[2][16]; +}; +static const struct float_class signed_floats[N_FORMATS][N_SIGNED_CLASSES]= =3D { + /* M4 =3D=3D 2: short */ + { + /* -inf */ {1, {{0xff, 0x80, 0x00, 0x00}}}, + /* -Fn */ {2, {{0xc2, 0x28, 0x00, 0x00}, + {0xc2, 0x29, 0x00, 0x00}}}, + /* -0 */ {1, {{0x80, 0x00, 0x00, 0x00}}}, + /* +0 */ {1, {{0x00, 0x00, 0x00, 0x00}}}, + /* +Fn */ {2, {{0x42, 0x28, 0x00, 0x00}, + {0x42, 0x2a, 0x00, 0x00}}}, + /* +inf */ {1, {{0x7f, 0x80, 0x00, 0x00}}}, + /* QNaN */ {2, {{0x7f, 0xff, 0xff, 0xff}, + {0x7f, 0xff, 0xff, 0xfe}}}, + /* SNaN */ {2, {{0x7f, 0xbf, 0xff, 0xff}, + {0x7f, 0xbf, 0xff, 0xfd}}}, + }, + + /* M4 =3D=3D 3: long */ + { + /* -inf */ {1, {{0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}}, + /* -Fn */ {2, {{0xc0, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + {0xc0, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}}, + /* -0 */ {1, {{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}}, + /* +0 */ {1, {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}}, + /* +Fn */ {2, {{0x40, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + {0x40, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}}, + /* +inf */ {1, {{0x7f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}}, + /* QNaN */ {2, {{0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, + {0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe}}}, + /* SNaN */ {2, {{0x7f, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, + {0x7f, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd}}}, + }, + + /* M4 =3D=3D 4: extended */ + { + /* -inf */ {1, {{0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0= x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}}, + /* -Fn */ {2, {{0xc0, 0x04, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0= x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + {0xc0, 0x04, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0= x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}}, + /* -0 */ {1, {{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0= x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}}, + /* +0 */ {1, {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0= x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}}, + /* +Fn */ {2, {{0x40, 0x04, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0= x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + {0x40, 0x04, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0= x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}}, + /* +inf */ {1, {{0x7f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0= x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}}, + /* QNaN */ {2, {{0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0= xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, + {0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0= xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe}}}, + /* SNaN */ {2, {{0x7f, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0= xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, + {0x7f, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0= xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd}}}, + }, +}; +static const unsigned char default_nans[N_FORMATS][16] =3D { + /* M4 =3D=3D 2: short */ {0x7f, 0xc0, 0x00, 0x00}, + /* M4 =3D=3D 3: long */ {0x7f, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,= 0x00}, + /* M4 =3D=3D 4: extended */ {0x7f, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00,= 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, +}; + +static void dump_v(FILE *f, const void *v, size_t n) +{ + for (int i =3D 0; i < n; i++) { + fprintf(f, "%02x", ((const unsigned char *)v)[i]); + } +} + +static void snan_to_qnan(char *v, int fmt) +{ + size_t bit =3D 1 + e_bits[fmt]; + v[bit / 8] |=3D 1 << (7 - (bit % 8)); +} + +#endif diff --git a/tests/tcg/s390x/fma.c b/tests/tcg/s390x/fma.c new file mode 100644 index 0000000000..6872f59a7a --- /dev/null +++ b/tests/tcg/s390x/fma.c @@ -0,0 +1,233 @@ +/* + * Test floating-point multiply-and-add instructions. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#include +#include +#include +#include +#include +#include "float.h" + +union val { + float e; + double d; + long double x; + char buf[16]; +}; + +/* + * PoP tables as close to the original as possible. + */ +static const char *table1[N_SIGNED_CLASSES][N_SIGNED_CLASSES] =3D { + /* -inf -Fn -0 +0 = +Fn +inf QNaN SNaN */ + {/* -inf */ "P(+inf)", "P(+inf)", "Xi: T(dNaN)", "Xi: T(dNaN)", = "P(-inf)", "P(-inf)", "P(b)", "Xi: T(b*)"}, + {/* -Fn */ "P(+inf)", "P(a*b)", "P(+0)", "P(-0)", = "P(a*b)", "P(-inf)", "P(b)", "Xi: T(b*)"}, + {/* -0 */ "Xi: T(dNaN)", "P(+0)", "P(+0)", "P(-0)", = "P(-0)", "Xi: T(dNaN)", "P(b)", "Xi: T(b*)"}, + {/* +0 */ "Xi: T(dNaN)", "P(-0)", "P(-0)", "P(+0)", = "P(+0)", "Xi: T(dNaN)", "P(b)", "Xi: T(b*)"}, + {/* +Fn */ "P(-inf)", "P(a*b)", "P(-0)", "P(+0)", = "P(a*b)", "P(+inf)", "P(b)", "Xi: T(b*)"}, + {/* +inf */ "P(-inf)", "P(-inf)", "Xi: T(dNaN)", "Xi: T(dNaN)", = "P(+inf)", "P(+inf)", "P(b)", "Xi: T(b*)"}, + {/* QNaN */ "P(a)", "P(a)", "P(a)", "P(a)", = "P(a)", "P(a)", "P(a)", "Xi: T(b*)"}, + {/* SNaN */ "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", = "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)", "Xi: T(a*)"}, +}; + +static const char *table2[N_SIGNED_CLASSES][N_SIGNED_CLASSES] =3D { + /* -inf -Fn -0 +0 +Fn = +inf QNaN SNaN */ + {/* -inf */ "T(-inf)", "T(-inf)", "T(-inf)", "T(-inf)", "T(-inf)",= "Xi: T(dNaN)", "T(c)", "Xi: T(c*)"}, + {/* -Fn */ "T(-inf)", "R(p+c)", "R(p)", "R(p)", "R(p+c)", = "T(+inf)", "T(c)", "Xi: T(c*)"}, + {/* -0 */ "T(-inf)", "R(c)", "T(-0)", "Rezd", "R(c)", = "T(+inf)", "T(c)", "Xi: T(c*)"}, + {/* +0 */ "T(-inf)", "R(c)", "Rezd", "T(+0)", "R(c)", = "T(+inf)", "T(c)", "Xi: T(c*)"}, + {/* +Fn */ "T(-inf)", "R(p+c)", "R(p)", "R(p)", "R(p+c)", = "T(+inf)", "T(c)", "Xi: T(c*)"}, + {/* +inf */ "Xi: T(dNaN)", "T(+inf)", "T(+inf)", "T(+inf)", "T(+inf)",= "T(+inf)", "T(c)", "Xi: T(c*)"}, + {/* QNaN */ "T(p)", "T(p)", "T(p)", "T(p)", "T(p)", = "T(p)", "T(p)", "Xi: T(c*)"}, + /* SNaN: can't happen */ +}; + +static void interpret_tables(union val *r, bool *xi, int fmt, + int cls_a, const union val *a, + int cls_b, const union val *b, + int cls_c, const union val *c) +{ + const char *spec1 =3D table1[cls_a][cls_b]; + const char *spec2; + union val p; + int cls_p; + + *xi =3D false; + + if (strcmp(spec1, "P(-inf)") =3D=3D 0) { + cls_p =3D CLASS_MINUS_INF; + } else if (strcmp(spec1, "P(+inf)") =3D=3D 0) { + cls_p =3D CLASS_PLUS_INF; + } else if (strcmp(spec1, "P(-0)") =3D=3D 0) { + cls_p =3D CLASS_MINUS_ZERO; + } else if (strcmp(spec1, "P(+0)") =3D=3D 0) { + cls_p =3D CLASS_PLUS_ZERO; + } else if (strcmp(spec1, "P(a)") =3D=3D 0) { + cls_p =3D cls_a; + memcpy(&p, a, sizeof(p)); + } else if (strcmp(spec1, "P(b)") =3D=3D 0) { + cls_p =3D cls_b; + memcpy(&p, b, sizeof(p)); + } else if (strcmp(spec1, "P(a*b)") =3D=3D 0) { + /* + * In the general case splitting fma into multiplication and addit= ion + * doesn't work, but this is the case with our test inputs. + */ + cls_p =3D cls_a =3D=3D cls_b ? CLASS_PLUS_FN : CLASS_MINUS_FN; + switch (fmt) { + case 0: + p.e =3D a->e * b->e; + break; + case 1: + p.d =3D a->d * b->d; + break; + case 2: + p.x =3D a->x * b->x; + break; + default: + fprintf(stderr, "Unsupported fmt: %d\n", fmt); + exit(1); + } + } else if (strcmp(spec1, "Xi: T(dNaN)") =3D=3D 0) { + memcpy(r, default_nans[fmt], sizeof(*r)); + *xi =3D true; + return; + } else if (strcmp(spec1, "Xi: T(a*)") =3D=3D 0) { + memcpy(r, a, sizeof(*r)); + snan_to_qnan(r->buf, fmt); + *xi =3D true; + return; + } else if (strcmp(spec1, "Xi: T(b*)") =3D=3D 0) { + memcpy(r, b, sizeof(*r)); + snan_to_qnan(r->buf, fmt); + *xi =3D true; + return; + } else { + fprintf(stderr, "Unsupported spec1: %s\n", spec1); + exit(1); + } + + spec2 =3D table2[cls_p][cls_c]; + if (strcmp(spec2, "T(-inf)") =3D=3D 0) { + memcpy(r, signed_floats[fmt][CLASS_MINUS_INF].v[0], sizeof(*r)); + } else if (strcmp(spec2, "T(+inf)") =3D=3D 0) { + memcpy(r, signed_floats[fmt][CLASS_PLUS_INF].v[0], sizeof(*r)); + } else if (strcmp(spec2, "T(-0)") =3D=3D 0) { + memcpy(r, signed_floats[fmt][CLASS_MINUS_ZERO].v[0], sizeof(*r)); + } else if (strcmp(spec2, "T(+0)") =3D=3D 0 || strcmp(spec2, "Rezd") = =3D=3D 0) { + memcpy(r, signed_floats[fmt][CLASS_PLUS_ZERO].v[0], sizeof(*r)); + } else if (strcmp(spec2, "R(c)") =3D=3D 0 || strcmp(spec2, "T(c)") =3D= =3D 0) { + memcpy(r, c, sizeof(*r)); + } else if (strcmp(spec2, "R(p)") =3D=3D 0 || strcmp(spec2, "T(p)") =3D= =3D 0) { + memcpy(r, &p, sizeof(*r)); + } else if (strcmp(spec2, "R(p+c)") =3D=3D 0 || strcmp(spec2, "T(p+c)")= =3D=3D 0) { + switch (fmt) { + case 0: + r->e =3D p.e + c->e; + break; + case 1: + r->d =3D p.d + c->d; + break; + case 2: + r->x =3D p.x + c->x; + break; + default: + fprintf(stderr, "Unsupported fmt: %d\n", fmt); + exit(1); + } + } else if (strcmp(spec2, "Xi: T(dNaN)") =3D=3D 0) { + memcpy(r, default_nans[fmt], sizeof(*r)); + *xi =3D true; + } else if (strcmp(spec2, "Xi: T(c*)") =3D=3D 0) { + memcpy(r, c, sizeof(*r)); + snan_to_qnan(r->buf, fmt); + *xi =3D true; + } else { + fprintf(stderr, "Unsupported spec2: %s\n", spec2); + exit(1); + } +} + +struct iter { + int fmt; + int cls[3]; + int val[3]; +}; + +static bool iter_next(struct iter *it) +{ + int i; + + for (i =3D 2; i >=3D 0; i--) { + if (++it->val[i] !=3D signed_floats[it->fmt][it->cls[i]].n) { + return true; + } + it->val[i] =3D 0; + + if (++it->cls[i] !=3D N_SIGNED_CLASSES) { + return true; + } + it->cls[i] =3D 0; + } + + return ++it->fmt !=3D N_FORMATS; +} + +int main(void) +{ + int ret =3D EXIT_SUCCESS; + struct iter it =3D {}; + + do { + size_t n =3D float_sizes[it.fmt]; + union val a, b, c, exp, res; + bool xi_exp, xi; + + memcpy(&a, signed_floats[it.fmt][it.cls[0]].v[it.val[0]], sizeof(a= )); + memcpy(&b, signed_floats[it.fmt][it.cls[1]].v[it.val[1]], sizeof(b= )); + memcpy(&c, signed_floats[it.fmt][it.cls[2]].v[it.val[2]], sizeof(c= )); + + interpret_tables(&exp, &xi_exp, it.fmt, + it.cls[1], &b, it.cls[2], &c, it.cls[0], &a); + + memcpy(&res, &a, sizeof(res)); + feclearexcept(FE_ALL_EXCEPT); + switch (it.fmt) { + case 0: + asm("maebr %[a],%[b],%[c]" + : [a] "+f" (res.e) : [b] "f" (b.e), [c] "f" (c.e)); + break; + case 1: + asm("madbr %[a],%[b],%[c]" + : [a] "+f" (res.d) : [b] "f" (b.d), [c] "f" (c.d)); + break; + case 2: + asm("wfmaxb %[a],%[c],%[b],%[a]" + : [a] "+v" (res.x) : [b] "v" (b.x), [c] "v" (c.x)); + break; + default: + fprintf(stderr, "Unsupported fmt: %d\n", it.fmt); + exit(1); + } + xi =3D fetestexcept(FE_ALL_EXCEPT) =3D=3D FE_INVALID; + + if (memcmp(&res, &exp, n) !=3D 0 || xi !=3D xi_exp) { + fprintf(stderr, "[ FAILED ] "); + dump_v(stderr, &b, n); + fprintf(stderr, " * "); + dump_v(stderr, &c, n); + fprintf(stderr, " + "); + dump_v(stderr, &a, n); + fprintf(stderr, ": actual=3D"); + dump_v(stderr, &res, n); + fprintf(stderr, "/%d, expected=3D", (int)xi); + dump_v(stderr, &exp, n); + fprintf(stderr, "/%d\n", (int)xi_exp); + ret =3D EXIT_FAILURE; + } + } while (iter_next(&it)); + + return ret; +} diff --git a/tests/tcg/s390x/vfminmax.c b/tests/tcg/s390x/vfminmax.c index 22629df160..e66285f762 100644 --- a/tests/tcg/s390x/vfminmax.c +++ b/tests/tcg/s390x/vfminmax.c @@ -4,6 +4,8 @@ #include #include =20 +#include "float.h" + /* * vfmin/vfmax instruction execution. */ @@ -21,98 +23,21 @@ static void vfminmax(unsigned int op, unsigned int m4, unsigned int m5, unsigned int m6, void *v1, const void *v2, const void *v3) { - insn[3] =3D (m6 << 4) | m5; - insn[4] =3D (m4 << 4) | 0x0e; - insn[5] =3D op; + insn[3] =3D (m6 << 4) | m5; + insn[4] =3D (m4 << 4) | 0x0e; + insn[5] =3D op; =20 asm("vl %%v25,%[v2]\n" "vl %%v26,%[v3]\n" "ex 0,%[insn]\n" "vst %%v24,%[v1]\n" : [v1] "=3Dm" (*(char (*)[16])v1) - : [v2] "m" (*(char (*)[16])v2) - , [v3] "m" (*(char (*)[16])v3) - , [insn] "m"(insn) + : [v2] "m" (*(const char (*)[16])v2) + , [v3] "m" (*(const char (*)[16])v3) + , [insn] "m" (insn) : "v24", "v25", "v26"); } =20 -/* - * Floating-point value classes. - */ -#define N_FORMATS 3 -#define N_SIGNED_CLASSES 8 -static const size_t float_sizes[N_FORMATS] =3D { - /* M4 =3D=3D 2: short */ 4, - /* M4 =3D=3D 3: long */ 8, - /* M4 =3D=3D 4: extended */ 16, -}; -static const size_t e_bits[N_FORMATS] =3D { - /* M4 =3D=3D 2: short */ 8, - /* M4 =3D=3D 3: long */ 11, - /* M4 =3D=3D 4: extended */ 15, -}; -static const unsigned char signed_floats[N_FORMATS][N_SIGNED_CLASSES][2][1= 6] =3D { - /* M4 =3D=3D 2: short */ - { - /* -inf */ {{0xff, 0x80, 0x00, 0x00}, - {0xff, 0x80, 0x00, 0x00}}, - /* -Fn */ {{0xc2, 0x28, 0x00, 0x00}, - {0xc2, 0x29, 0x00, 0x00}}, - /* -0 */ {{0x80, 0x00, 0x00, 0x00}, - {0x80, 0x00, 0x00, 0x00}}, - /* +0 */ {{0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00}}, - /* +Fn */ {{0x42, 0x28, 0x00, 0x00}, - {0x42, 0x2a, 0x00, 0x00}}, - /* +inf */ {{0x7f, 0x80, 0x00, 0x00}, - {0x7f, 0x80, 0x00, 0x00}}, - /* QNaN */ {{0x7f, 0xff, 0xff, 0xff}, - {0x7f, 0xff, 0xff, 0xfe}}, - /* SNaN */ {{0x7f, 0xbf, 0xff, 0xff}, - {0x7f, 0xbf, 0xff, 0xfd}}, - }, - - /* M4 =3D=3D 3: long */ - { - /* -inf */ {{0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - /* -Fn */ {{0xc0, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0xc0, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - /* -0 */ {{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - /* +0 */ {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - /* +Fn */ {{0x40, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x40, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - /* +inf */ {{0x7f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x7f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - /* QNaN */ {{0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, - {0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe}}, - /* SNaN */ {{0x7f, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, - {0x7f, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd}}, - }, - - /* M4 =3D=3D 4: extended */ - { - /* -inf */ {{0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,= 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,= 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - /* -Fn */ {{0xc0, 0x04, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,= 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0xc0, 0x04, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,= 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - /* -0 */ {{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,= 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,= 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - /* +0 */ {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,= 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,= 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - /* +Fn */ {{0x40, 0x04, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,= 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x40, 0x04, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,= 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - /* +inf */ {{0x7f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,= 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x7f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,= 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, - /* QNaN */ {{0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,= 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, - {0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,= 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe}}, - /* SNaN */ {{0x7f, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,= 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, - {0x7f, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,= 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd}}, - }, -}; - /* * PoP tables as close to the original as possible. */ @@ -285,13 +210,6 @@ struct signed_test { }, }; =20 -static void dump_v(FILE *f, const void *v, size_t n) -{ - for (int i =3D 0; i < n; i++) { - fprintf(f, "%02x", ((const unsigned char *)v)[i]); - } -} - static int signed_test(struct signed_test *test, int m4, int m5, const void *v1_exp, bool xi_exp, const void *v2, const void *v3) @@ -320,10 +238,28 @@ static int signed_test(struct signed_test *test, int = m4, int m5, return 0; } =20 -static void snan_to_qnan(char *v, int m4) +struct iter { + int cls[2]; + int val[2]; +}; + +static bool iter_next(struct iter *it, int fmt) { - size_t bit =3D 1 + e_bits[m4 - 2]; - v[bit / 8] |=3D 1 << (7 - (bit % 8)); + int i; + + for (i =3D 1; i >=3D 0; i--) { + if (++it->val[i] !=3D signed_floats[fmt][it->cls[i]].n) { + return true; + } + it->val[i] =3D 0; + + if (++it->cls[i] !=3D N_SIGNED_CLASSES) { + return true; + } + it->cls[i] =3D 0; + } + + return false; } =20 int main(void) @@ -333,72 +269,71 @@ int main(void) =20 for (i =3D 0; i < sizeof(signed_tests) / sizeof(signed_tests[0]); i++)= { struct signed_test *test =3D &signed_tests[i]; - int m4; + int fmt; =20 - for (m4 =3D 2; m4 <=3D 4; m4++) { - const unsigned char (*floats)[2][16] =3D signed_floats[m4 - 2]; - size_t float_size =3D float_sizes[m4 - 2]; + for (fmt =3D 0; fmt < N_FORMATS; fmt++) { + size_t float_size =3D float_sizes[fmt]; + int m4 =3D fmt + 2; int m5; =20 for (m5 =3D 0; m5 <=3D 8; m5 +=3D 8) { char v1_exp[16], v2[16], v3[16]; bool xi_exp =3D false; + struct iter it =3D {}; int pos =3D 0; - int i2; =20 - for (i2 =3D 0; i2 < N_SIGNED_CLASSES * 2; i2++) { - int i3; + do { + const char *spec =3D test->table[it.cls[0]][it.cls[1]]; =20 - for (i3 =3D 0; i3 < N_SIGNED_CLASSES * 2; i3++) { - const char *spec =3D test->table[i2 / 2][i3 / 2]; + memcpy(&v2[pos], + signed_floats[fmt][it.cls[0]].v[it.val[0]], + float_size); + memcpy(&v3[pos], + signed_floats[fmt][it.cls[1]].v[it.val[1]], + float_size); + if (strcmp(spec, "T(a)") =3D=3D 0 || + strcmp(spec, "Xi: T(a)") =3D=3D 0) { + memcpy(&v1_exp[pos], &v2[pos], float_size); + } else if (strcmp(spec, "T(b)") =3D=3D 0 || + strcmp(spec, "Xi: T(b)") =3D=3D 0) { + memcpy(&v1_exp[pos], &v3[pos], float_size); + } else if (strcmp(spec, "Xi: T(a*)") =3D=3D 0) { + memcpy(&v1_exp[pos], &v2[pos], float_size); + snan_to_qnan(&v1_exp[pos], fmt); + } else if (strcmp(spec, "Xi: T(b*)") =3D=3D 0) { + memcpy(&v1_exp[pos], &v3[pos], float_size); + snan_to_qnan(&v1_exp[pos], fmt); + } else if (strcmp(spec, "T(M(a,b))") =3D=3D 0) { + /* + * Comparing floats is risky, since the compiler m= ight + * generate the same instruction that we are testi= ng. + * Compare ints instead. This works, because we get + * here only for +-Fn, and the corresponding test + * values have identical exponents. + */ + int v2_int =3D *(int *)&v2[pos]; + int v3_int =3D *(int *)&v3[pos]; =20 - memcpy(&v2[pos], floats[i2 / 2][i2 % 2], float_siz= e); - memcpy(&v3[pos], floats[i3 / 2][i3 % 2], float_siz= e); - if (strcmp(spec, "T(a)") =3D=3D 0 || - strcmp(spec, "Xi: T(a)") =3D=3D 0) { + if ((v2_int < v3_int) =3D=3D + ((test->op =3D=3D VFMIN) !=3D (v2_int < 0))) { memcpy(&v1_exp[pos], &v2[pos], float_size); - } else if (strcmp(spec, "T(b)") =3D=3D 0 || - strcmp(spec, "Xi: T(b)") =3D=3D 0) { - memcpy(&v1_exp[pos], &v3[pos], float_size); - } else if (strcmp(spec, "Xi: T(a*)") =3D=3D 0) { - memcpy(&v1_exp[pos], &v2[pos], float_size); - snan_to_qnan(&v1_exp[pos], m4); - } else if (strcmp(spec, "Xi: T(b*)") =3D=3D 0) { - memcpy(&v1_exp[pos], &v3[pos], float_size); - snan_to_qnan(&v1_exp[pos], m4); - } else if (strcmp(spec, "T(M(a,b))") =3D=3D 0) { - /* - * Comparing floats is risky, since the compil= er - * might generate the same instruction that we= are - * testing. Compare ints instead. This works, - * because we get here only for +-Fn, and the - * corresponding test values have identical - * exponents. - */ - int v2_int =3D *(int *)&v2[pos]; - int v3_int =3D *(int *)&v3[pos]; - - if ((v2_int < v3_int) =3D=3D - ((test->op =3D=3D VFMIN) !=3D (v2_int < 0)= )) { - memcpy(&v1_exp[pos], &v2[pos], float_size); - } else { - memcpy(&v1_exp[pos], &v3[pos], float_size); - } } else { - fprintf(stderr, "Unexpected spec: %s\n", spec); - return 1; + memcpy(&v1_exp[pos], &v3[pos], float_size); } - xi_exp |=3D spec[0] =3D=3D 'X'; - pos +=3D float_size; + } else { + fprintf(stderr, "Unexpected spec: %s\n", spec); + return 1; + } + xi_exp |=3D spec[0] =3D=3D 'X'; + pos +=3D float_size; =20 - if ((m5 & 8) || pos =3D=3D 16) { - ret |=3D signed_test(test, m4, m5, - v1_exp, xi_exp, v2, v3); - pos =3D 0; - xi_exp =3D false; - } + if ((m5 & 8) || pos =3D=3D 16) { + ret |=3D signed_test(test, m4, m5, + v1_exp, xi_exp, v2, v3); + pos =3D 0; + xi_exp =3D false; } - } + } while (iter_next(&it, fmt)); =20 if (pos !=3D 0) { ret |=3D signed_test(test, m4, m5, v1_exp, xi_exp, v2,= v3); diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.tar= get index 2dab4f4582..da5fe71a40 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -74,8 +74,11 @@ $(Z13_TESTS): CFLAGS+=3D-march=3Dz13 -O2 TESTS+=3D$(Z13_TESTS) =20 ifneq ($(CROSS_CC_HAS_Z14),) -Z14_TESTS=3Dvfminmax +Z14_TESTS=3Dfma vfminmax +fma: float.h +fma: LDFLAGS+=3D-lm vfminmax: LDFLAGS+=3D-lm +vfminmax: float.h $(Z14_TESTS): CFLAGS+=3D-march=3Dz14 -O2 TESTS+=3D$(Z14_TESTS) endif --=20 2.47.0 From nobody Sat Nov 23 18:02:54 2024 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=1731951453; cv=none; d=zohomail.com; s=zohoarc; b=Zhtabl5QuMWGcL2v60WfHimRkOqXOmUzp+8yBaB0cLwrLTdmCnxcv+1aMysNoMUNqj0qJO1qewXchcNd82fbOU8XWS03ehRzOCsmqbK/tggzamuOmylBW/1I5PvcA0Ww7csYeRMJxuQQJ3wuT4hY1s5pCzAWvoTeJTIJXElJrOM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731951453; 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=VJhFIt+Avk9efs65XYYhBIvWur/LnUUbkyjdszyi2Io=; b=ThZyIhZnKef8JaFyKCQc7DddMoO3V+VFZ0oVvHl7Jkc/Ea98xtU3XBFZKaxUIHBgJ3vQA+Q+MUoCJH3yVuqmM3hEIBnIo71wfUvWmkl+YdK46QbZjoX4WeDQo7vfTT54h4rMAYUBHncHSq+VqCm+AozOqKden108TVB2zqNLfqQ= 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 1731951453112138.10846926732881; Mon, 18 Nov 2024 09:37:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tD5gc-0008Gr-L5; Mon, 18 Nov 2024 12:37:19 -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 ) id 1tD5gF-0008Aq-N2 for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:00 -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 ) id 1tD5gD-0004lJ-VZ for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:36:55 -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-212-sFgwC8BXOD6ouafXXwan7w-1; Mon, 18 Nov 2024 12:36:50 -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 BA9B2195608B; Mon, 18 Nov 2024 17:36:48 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.53]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3E5E919560A3; Mon, 18 Nov 2024 17:36:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731951413; 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=VJhFIt+Avk9efs65XYYhBIvWur/LnUUbkyjdszyi2Io=; b=bEffYB6EjRnDZvCTkOHv2kqSpkbeu0lWOsJzY3P41UNfyAJWbZNGtljJxTlMtLIv46/8bi M2xef+DtmzPWBDNVwP4CabaREwbLXQjFy/4/wFoNMi6Vbx1IAGLvSvVV0qqzK0nW2D1aQE XuQxqdOMZDb0wjwBfvX/rZIwzziasl0= X-MC-Unique: sFgwC8BXOD6ouafXXwan7w-1 X-Mimecast-MFC-AGG-ID: sFgwC8BXOD6ouafXXwan7w From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Jared Rossi Subject: [PULL 04/12] docs/system/s390x/bootdevices: Update loadparm documentation Date: Mon, 18 Nov 2024 18:36:26 +0100 Message-ID: <20241118173634.473532-5-thuth@redhat.com> In-Reply-To: <20241118173634.473532-1-thuth@redhat.com> References: <20241118173634.473532-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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.142, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1731951454809116600 Content-Type: text/plain; charset="utf-8" From: Jared Rossi Update documentation to include per-device loadparm support. Signed-off-by: Jared Rossi Reviewed-by: Thomas Huth Message-ID: <20241115002742.3576842-1-jrossi@linux.ibm.com> Signed-off-by: Thomas Huth --- docs/system/s390x/bootdevices.rst | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/docs/system/s390x/bootdevices.rst b/docs/system/s390x/bootdevi= ces.rst index 1a1a764c1c..97b3914785 100644 --- a/docs/system/s390x/bootdevices.rst +++ b/docs/system/s390x/bootdevices.rst @@ -79,7 +79,29 @@ The second way to use this parameter is to use a number = in the range from 0 to 31. The numbers that can be used here correspond to the numbers that are shown when using the ``PROMPT`` option, and the s390-ccw bios will then try to automatically boot the kernel that is associated with the given number. -Note that ``0`` can be used to boot the default entry. +Note that ``0`` can be used to boot the default entry. If the machine +``loadparm`` is not assigned a value, then the default entry is used. + +By default, the machine ``loadparm`` applies to all boot devices. If multi= ple +devices are assigned a ``bootindex`` and the ``loadparm`` is to be differe= nt +between them, an independent ``loadparm`` may be assigned on a per-device = basis. + +An example guest using per-device ``loadparm``:: + + qemu-system-s390x -drive if=3Dnone,id=3Ddr1,file=3Dprimary.qcow2 \ + -device virtio-blk,drive=3Ddr1,bootindex=3D1 \ + -drive if=3Dnone,id=3Ddr2,file=3Dsecondary.qcow2 \ + -device virtio-blk,drive=3Ddr2,bootindex=3D2,loadparm= =3D3 + +In this case, the primary boot device will attempt to IPL using the default +entry (because no ``loadparm`` is specified for this device or for the +machine). If that device fails to boot, the secondary device will attempt = to +IPL using entry number 3. + +If a ``loadparm`` is specified on both the machine and a device, the per-d= evice +value will superseded the machine value. Per-device ``loadparm`` values a= re +only used for devices with an assigned ``bootindex``. The machine ``loadpa= rm`` +is used when attempting to boot without a ``bootindex``. =20 =20 Booting from a network device --=20 2.47.0 From nobody Sat Nov 23 18:02:54 2024 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=1731951485; cv=none; d=zohomail.com; s=zohoarc; b=P8P5GPpgpnrAsUNOlE7ZkLbRdyJBShPLCqfgXzy+PbFYmd+zazdWDMnRo0NOUflvag18WrJzJWhAiffCjOGvQFMyrVzO5diRlk1QIOPRakM4zUseQWCv2lvSXkQZZdEFd8JFmut1nZOtuTIBK/rSd1KCFqgDGBg2MFhcnHv9pkw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731951485; 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=e8ZOrdpB+ECk3Jgi1cOPWcA2xDFMmyVZMqYQcUknafY=; b=dWRyy9jD8cklx5p9nrxS2JuteqHRi6zeNKi8Fqyhx9nlwwT6vJ8WDApZIEhVBt6hOa9wT1VH5D490rb01KS5hIVm2aNFGiziLC+fk1OAjhd3OyDR63QXjQ/r1E4EWDR+oZ+uJmADTiaevb8csKZbOO+/rWnoK6nHt6XGwMLbQwo= 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 1731951485416259.4687457750581; Mon, 18 Nov 2024 09:38:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tD5gq-0008Td-TF; Mon, 18 Nov 2024 12:37: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 ) id 1tD5gJ-0008B5-9O for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:00 -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 ) id 1tD5gG-0004lp-Gd for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:36:58 -0500 Received: from mx-prod-mc-03.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-402-Lu48QJ2cPkqQemdfajHgIg-1; Mon, 18 Nov 2024 12:36:54 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 55DE219560AA; Mon, 18 Nov 2024 17:36:53 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.53]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A81C219560A3; Mon, 18 Nov 2024 17:36:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731951415; 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=e8ZOrdpB+ECk3Jgi1cOPWcA2xDFMmyVZMqYQcUknafY=; b=f1mrVVJuIVOXStUjpLmOzNtogYrIXbhYp4NJZUoO9oTV3DdwVxUWKs4m95X2GCCiD2g0Mt mXfhRf2bwbSW8XVUg7ukPCTlg8gHkXZ6/Wk/XkwdJOoFPNgX5N4Cnvr90LHC8ov+wQiYCE 4kkdkvPyV9UZ+uCaZpvEtSnzEn8rX2U= X-MC-Unique: Lu48QJ2cPkqQemdfajHgIg-1 X-Mimecast-MFC-AGG-ID: Lu48QJ2cPkqQemdfajHgIg From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Boris Fiuczynski , Prasad Pandit Subject: [PULL 05/12] docs/system/bootindex: Make it clear that s390x can also boot from virtio-net Date: Mon, 18 Nov 2024 18:36:27 +0100 Message-ID: <20241118173634.473532-6-thuth@redhat.com> In-Reply-To: <20241118173634.473532-1-thuth@redhat.com> References: <20241118173634.473532-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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.142, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1731951486775116600 Content-Type: text/plain; charset="utf-8" Let's make it clear that s390x can also boot from virtio-net, to avoid that people think that s390x can only boot from disk devices. Reported-by: Boris Fiuczynski Message-ID: <20241111105506.264640-1-thuth@redhat.com> Reviewed-by: Prasad Pandit Reviewed-by: Boris Fiuczynski Signed-off-by: Thomas Huth --- docs/system/bootindex.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/system/bootindex.rst b/docs/system/bootindex.rst index 988f7b3beb..5e1b33ee22 100644 --- a/docs/system/bootindex.rst +++ b/docs/system/bootindex.rst @@ -53,7 +53,7 @@ booting. For instance, the x86 PC BIOS boot specificatio= n allows only one disk to be bootable. If boot from disk fails for some reason, the x86 BIOS won't retry booting from other disk. It can still try to boot from floppy or net, though. In the case of s390x BIOS, the BIOS will try up to -8 total devices, any number of which may be disks. +8 total devices, any number of which may be disks or virtio-net devices. =20 Sometimes, firmware cannot map the device path QEMU wants firmware to boot from to a boot method. It doesn't happen for devices the firmware --=20 2.47.0 From nobody Sat Nov 23 18:02:54 2024 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=1731951533; cv=none; d=zohomail.com; s=zohoarc; b=IXIgqyicNblO/tkZzUMo/lYT0sysN4rq+4Yz27yXBBsy3WV8SJvftiKs9el0eQsSuyDxLGWBeuGWdrCfq5sS6Jo4fdACcxtTSfph9ge59hWt2o9goTsGiOialtUdgGDy3HUk0SJGRHDaPeopqPGX+lfapyYmrry6tiQrn0sK6Z0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731951533; h=Content-Type: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=LIFQ3iIfQ6WGQ+3ewFMhClo7IyMsvlGjJ+aMfrpuFkE=; b=YmFYIaBWKD2TuHxRmknj3zRKogYnSpifOMuK0hFsqFraRI3jw7Vzfe/5HK0GEFzoCqVcwoK8ddU8U0SdgvL71TXB9sIbmHa+k+cRC1ecSARYU93Ynz9CLtfNK/5zGc78Np8EtwlCC4/6hsMm35TttpJJA/uOEqcdOQr+N5RfLjg= 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 1731951533526194.09615297567711; Mon, 18 Nov 2024 09:38:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tD5gs-0000JC-0R; Mon, 18 Nov 2024 12:37:34 -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 ) id 1tD5gR-0008Fo-0Y for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:09 -0500 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 1tD5gP-0004mo-GE for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:06 -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-553-8-Qii9qrMnSkhsU8jo8v2w-1; Mon, 18 Nov 2024 12:37:02 -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 6E72C1955F42; Mon, 18 Nov 2024 17:36:56 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.53]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 183FE19560A3; Mon, 18 Nov 2024 17:36:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731951424; 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=LIFQ3iIfQ6WGQ+3ewFMhClo7IyMsvlGjJ+aMfrpuFkE=; b=aUxn45Sh+JmPL7Z5XNIziuTfxEObeKUe7NwmuMZFhRpK0DmmpEl9b8GnJoSf8oWmRZv3yS dZPhceunkGwcsMHKW9K2QxLClX01R1EVdpmTCXa2kEEatY/nyB0FT9K9fpACtImBuW2PQ5 hFH1IZ2UTk4jy3GSy6ttnGX+N09UfJQ= X-MC-Unique: 8-Qii9qrMnSkhsU8jo8v2w-1 X-Mimecast-MFC-AGG-ID: 8-Qii9qrMnSkhsU8jo8v2w From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jared Rossi Subject: [PULL 06/12] hw/s390x: Restrict "loadparm" property to devices that can be used for booting Date: Mon, 18 Nov 2024 18:36:28 +0100 Message-ID: <20241118173634.473532-7-thuth@redhat.com> In-Reply-To: <20241118173634.473532-1-thuth@redhat.com> References: <20241118173634.473532-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.142, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1731951534954116600 Commit bb185de423 ("s390x: Add individual loadparm assignment to CCW device") added a "loadparm" property to all CCW devices. This was a little bit unfortunate, since this property is only useful for devices that can be used for booting, but certainly it is not useful for devices like virtio-gpu or virtio-tablet. Thus let's restrict the property to CCW devices that we can boot from (i.e. virtio-block, virtio-net and vfio-ccw devices). Message-ID: <20241113114741.681096-1-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Jared Rossi Signed-off-by: Thomas Huth --- hw/s390x/ccw-device.h | 5 +++++ hw/s390x/ccw-device.c | 4 +--- hw/s390x/virtio-ccw-blk.c | 1 + hw/s390x/virtio-ccw-net.c | 1 + hw/vfio/ccw.c | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/s390x/ccw-device.h b/hw/s390x/ccw-device.h index 1e1737c0f3..4439feb140 100644 --- a/hw/s390x/ccw-device.h +++ b/hw/s390x/ccw-device.h @@ -51,4 +51,9 @@ static inline CcwDevice *to_ccw_dev_fast(DeviceState *d) =20 OBJECT_DECLARE_TYPE(CcwDevice, CCWDeviceClass, CCW_DEVICE) =20 +extern const PropertyInfo ccw_loadparm; + +#define DEFINE_PROP_CCW_LOADPARM(_n, _s, _f) \ + DEFINE_PROP(_n, _s, _f, ccw_loadparm, typeof(uint8_t[8])) + #endif diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c index 230cc09e03..30f2fb486f 100644 --- a/hw/s390x/ccw-device.c +++ b/hw/s390x/ccw-device.c @@ -73,7 +73,7 @@ static void ccw_device_set_loadparm(Object *obj, Visitor = *v, s390_ipl_fmt_loadparm(dev->loadparm, val, errp); } =20 -static const PropertyInfo ccw_loadparm =3D { +const PropertyInfo ccw_loadparm =3D { .name =3D "ccw_loadparm", .description =3D "Up to 8 chars in set of [A-Za-z0-9. ] to pass" " to the guest loader/kernel", @@ -85,8 +85,6 @@ static Property ccw_device_properties[] =3D { DEFINE_PROP_CSS_DEV_ID("devno", CcwDevice, devno), DEFINE_PROP_CSS_DEV_ID_RO("dev_id", CcwDevice, dev_id), DEFINE_PROP_CSS_DEV_ID_RO("subch_id", CcwDevice, subch_id), - DEFINE_PROP("loadparm", CcwDevice, loadparm, ccw_loadparm, - typeof(uint8_t[8])), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/s390x/virtio-ccw-blk.c b/hw/s390x/virtio-ccw-blk.c index 8e0e58b77d..2364432c6e 100644 --- a/hw/s390x/virtio-ccw-blk.c +++ b/hw/s390x/virtio-ccw-blk.c @@ -48,6 +48,7 @@ static Property virtio_ccw_blk_properties[] =3D { VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true), DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev, VIRTIO_CCW_MAX_REV), + DEFINE_PROP_CCW_LOADPARM("loadparm", CcwDevice, loadparm), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/s390x/virtio-ccw-net.c b/hw/s390x/virtio-ccw-net.c index 484e617659..a4a3f65c7e 100644 --- a/hw/s390x/virtio-ccw-net.c +++ b/hw/s390x/virtio-ccw-net.c @@ -51,6 +51,7 @@ static Property virtio_ccw_net_properties[] =3D { VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true), DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev, VIRTIO_CCW_MAX_REV), + DEFINE_PROP_CCW_LOADPARM("loadparm", CcwDevice, loadparm), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 24703c814a..c1cd7736cd 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -662,6 +662,7 @@ static Property vfio_ccw_properties[] =3D { DEFINE_PROP_LINK("iommufd", VFIOCCWDevice, vdev.iommufd, TYPE_IOMMUFD_BACKEND, IOMMUFDBackend *), #endif + DEFINE_PROP_CCW_LOADPARM("loadparm", CcwDevice, loadparm), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.47.0 From nobody Sat Nov 23 18:02:54 2024 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=1731951522; cv=none; d=zohomail.com; s=zohoarc; b=Qwnff4VhCrzwREMXFjwO1b0pAwFRqHMWZQhP2OAKXQ17LZ0B4wIk+YzTWh1Tj+5hXcOMkuUqb7B4R1h6CafmnW+rSfsSfcJsSvdigMI8sIUmcKrN8aq83FFs/CN2G96U96vb1tcm4t+LdKq+5zg/vE3FwzaAC4FTwoYbfXImKWg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731951522; 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=YnECL1oMu75MemisnEJ7sBQ9uK/sxW5ymL9eBjvWFcY=; b=M+BXrvhZkAJFSguvaAZyleH+Hkkzt6SFCbESSeNxwwkvAeF5R68ieV2yJcitHyY2okLplqoMqsllgJHjHjvW+8XJuh6Fr9LUFrjSF5KzjYhQIujP89l6Uttd9vXeyO/IEh/d/6HNHGMHicbg+rfWCC2Uy7KfoPdACKp/YbMv1/8= 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 1731951522563351.89343143637086; Mon, 18 Nov 2024 09:38:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tD5gv-0000bl-8e; Mon, 18 Nov 2024 12:37:37 -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 ) id 1tD5ga-0008Hi-7k for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:17 -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 ) id 1tD5gY-0004qJ-GC for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:15 -0500 Received: from mx-prod-mc-04.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-224-n7hq9Kt8O2ehM0YBFKUutQ-1; Mon, 18 Nov 2024 12:37:00 -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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8C94B197904C; Mon, 18 Nov 2024 17:36:58 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.53]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2CB67195DF81; Mon, 18 Nov 2024 17:36:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731951433; 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=YnECL1oMu75MemisnEJ7sBQ9uK/sxW5ymL9eBjvWFcY=; b=hqTUTs4zkM6X8Pjrg7zwbNMAoq1Rz5YHvYhVLwGoaAfwwdFJDySOK7RItZb5zI12ffzwTj InTHTKzrL5Pd666OWgdzOS5xfhYM93VZsXHaamJFz345GCFnNWIG9n0KKw6HR0Mu0pqO1H cQPXJNqEgX05WoiPnnDhV2aF/ggqjN0= X-MC-Unique: n7hq9Kt8O2ehM0YBFKUutQ-1 X-Mimecast-MFC-AGG-ID: n7hq9Kt8O2ehM0YBFKUutQ From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Eric Farman Subject: [PULL 07/12] hw: Add "loadparm" property to scsi disk devices for booting on s390x Date: Mon, 18 Nov 2024 18:36:29 +0100 Message-ID: <20241118173634.473532-8-thuth@redhat.com> In-Reply-To: <20241118173634.473532-1-thuth@redhat.com> References: <20241118173634.473532-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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.142, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1731951524999116600 Content-Type: text/plain; charset="utf-8" While adding the new flexible boot order feature on s390x recently, we missed to add the "loadparm" property to the scsi-hd and scsi-cd devices. This property is required on s390x to pass the information to the boot loader about which kernel should be started or whether the boot menu should be shown. But even more serious: The missing property is now causing trouble with the corresponding libvirt patches that assume that the "loadparm" property is either settable for all bootable devices (when the "boot order" feature is implemented in QEMU), or none (meaning the behaviour of older QEMUs that only allowed one "loadparm" at the machine level). To fix this broken situation, let's implement the "loadparm" property in for the SCSI devices, too. Message-ID: <20241115141202.1877294-1-thuth@redhat.com> Acked-by: Eric Farman Signed-off-by: Thomas Huth --- include/hw/qdev-properties-system.h | 3 ++ hw/core/qdev-properties-system.c | 26 +++++++++++++++++ hw/s390x/ipl.c | 19 ++++--------- hw/scsi/scsi-disk.c | 43 +++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 13 deletions(-) diff --git a/include/hw/qdev-properties-system.h b/include/hw/qdev-properti= es-system.h index cdcc63056e..7ec37f6316 100644 --- a/include/hw/qdev-properties-system.h +++ b/include/hw/qdev-properties-system.h @@ -3,6 +3,9 @@ =20 #include "hw/qdev-properties.h" =20 +bool qdev_prop_sanitize_s390x_loadparm(uint8_t *loadparm, const char *str, + Error **errp); + extern const PropertyInfo qdev_prop_chr; extern const PropertyInfo qdev_prop_macaddr; extern const PropertyInfo qdev_prop_reserved_region; diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index 35deef05f3..a61c5ee6dd 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -58,6 +58,32 @@ static bool check_prop_still_unset(Object *obj, const ch= ar *name, return false; } =20 +bool qdev_prop_sanitize_s390x_loadparm(uint8_t *loadparm, const char *str, + Error **errp) +{ + int i, len; + + len =3D strlen(str); + if (len > 8) { + error_setg(errp, "'loadparm' can only contain up to 8 characters"); + return false; + } + + for (i =3D 0; i < len; i++) { + uint8_t c =3D qemu_toupper(str[i]); /* mimic HMC */ + + if (qemu_isalnum(c) || c =3D=3D '.' || c =3D=3D ' ') { + loadparm[i] =3D c; + } else { + error_setg(errp, + "invalid character in 'loadparm': '%c' (ASCII 0x%02= x)", + c, c); + return false; + } + } + + return true; +} =20 /* --- drive --- */ =20 diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index dc02b0fdda..30734661ad 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -418,21 +418,9 @@ static uint64_t s390_ipl_map_iplb_chain(IplParameterBl= ock *iplb_chain) =20 void s390_ipl_fmt_loadparm(uint8_t *loadparm, char *str, Error **errp) { - int i; - /* Initialize the loadparm with spaces */ memset(loadparm, ' ', LOADPARM_LEN); - for (i =3D 0; i < LOADPARM_LEN && str[i]; i++) { - uint8_t c =3D qemu_toupper(str[i]); /* mimic HMC */ - - if (qemu_isalnum(c) || c =3D=3D '.' || c =3D=3D ' ') { - loadparm[i] =3D c; - } else { - error_setg(errp, "LOADPARM: invalid character '%c' (ASCII 0x%0= 2x)", - c, c); - return; - } - } + qdev_prop_sanitize_s390x_loadparm(loadparm, str, errp); } =20 void s390_ipl_convert_loadparm(char *ascii_lp, uint8_t *ebcdic_lp) @@ -452,6 +440,7 @@ static bool s390_build_iplb(DeviceState *dev_st, IplPar= ameterBlock *iplb) SCSIDevice *sd; int devtype; uint8_t *lp; + g_autofree void *scsi_lp =3D NULL; =20 /* * Currently allow IPL only from CCW devices. @@ -463,6 +452,10 @@ static bool s390_build_iplb(DeviceState *dev_st, IplPa= rameterBlock *iplb) switch (devtype) { case CCW_DEVTYPE_SCSI: sd =3D SCSI_DEVICE(dev_st); + scsi_lp =3D object_property_get_str(OBJECT(sd), "loadparm", NU= LL); + if (scsi_lp && strlen(scsi_lp) > 0) { + lp =3D scsi_lp; + } iplb->len =3D cpu_to_be32(S390_IPLB_MIN_QEMU_SCSI_LEN); iplb->blk0_len =3D cpu_to_be32(S390_IPLB_MIN_QEMU_SCSI_LEN - S390_IPLB_HEADER= _LEN); diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index cb222da7a5..8e553487d5 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -32,6 +32,7 @@ #include "migration/vmstate.h" #include "hw/scsi/emulation.h" #include "scsi/constants.h" +#include "sysemu/arch_init.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "hw/block/block.h" @@ -111,6 +112,7 @@ struct SCSIDiskState { char *vendor; char *product; char *device_id; + char *loadparm; /* only for s390x */ bool tray_open; bool tray_locked; /* @@ -3135,6 +3137,43 @@ BlockAIOCB *scsi_dma_writev(int64_t offset, QEMUIOVe= ctor *iov, return blk_aio_pwritev(s->qdev.conf.blk, offset, iov, 0, cb, cb_opaque= ); } =20 +static char *scsi_property_get_loadparm(Object *obj, Error **errp) +{ + return g_strdup(SCSI_DISK_BASE(obj)->loadparm); +} + +static void scsi_property_set_loadparm(Object *obj, const char *value, + Error **errp) +{ + void *lp_str; + + if (object_property_get_int(obj, "bootindex", NULL) < 0) { + error_setg(errp, "'loadparm' is only valid for boot devices"); + return; + } + + lp_str =3D g_malloc0(strlen(value)); + if (!qdev_prop_sanitize_s390x_loadparm(lp_str, value, errp)) { + g_free(lp_str); + return; + } + SCSI_DISK_BASE(obj)->loadparm =3D lp_str; +} + +static void scsi_property_add_specifics(DeviceClass *dc) +{ + ObjectClass *oc =3D OBJECT_CLASS(dc); + + /* The loadparm property is only supported on s390x */ + if (arch_type & QEMU_ARCH_S390X) { + object_class_property_add_str(oc, "loadparm", + scsi_property_get_loadparm, + scsi_property_set_loadparm); + object_class_property_set_description(oc, "loadparm", + "load parameter (s390x only)= "); + } +} + static void scsi_disk_base_class_initfn(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -3218,6 +3257,8 @@ static void scsi_hd_class_initfn(ObjectClass *klass, = void *data) dc->desc =3D "virtual SCSI disk"; device_class_set_props(dc, scsi_hd_properties); dc->vmsd =3D &vmstate_scsi_disk_state; + + scsi_property_add_specifics(dc); } =20 static const TypeInfo scsi_hd_info =3D { @@ -3258,6 +3299,8 @@ static void scsi_cd_class_initfn(ObjectClass *klass, = void *data) dc->desc =3D "virtual SCSI CD-ROM"; device_class_set_props(dc, scsi_cd_properties); dc->vmsd =3D &vmstate_scsi_disk_state; + + scsi_property_add_specifics(dc); } =20 static const TypeInfo scsi_cd_info =3D { --=20 2.47.0 From nobody Sat Nov 23 18:02:54 2024 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=1731951489; cv=none; d=zohomail.com; s=zohoarc; b=JoBBHVuINfxHfpMy+6piL5hHfQSCF5igJ5+GZCbK50nu5afjL74QdBOFVsoYLlDOyEpKyKUhC+NhTtUnN6NnL+z9omPHgSyLc1NuBtpLtzLbTAVpM25nG3QZ7JDVm24+GRsOcQOiBOvJ5l20ocYxDzqokuEaRgdSdnGNsD4zn4o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731951489; 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=9kniq6o51rC52CTgEXZF2VX5mVrF5y8QD9cn/IfAcJw=; b=oKgB7B0rIxPSymz05VesayAjqvmeTG13uFKRflbMESGCEgLN9Rfla8nk2L/iNdFL+U332b4Ubshs8TyRE7CEErXtGEaj1zxL3k8/7Keyu6rc615JgI3o0W82jR09upKfPE6w+RMQJGiNYZ4aNBL1nf0HqRF3fnWNE9d8vcScOg8= 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 1731951489657206.65012410817053; Mon, 18 Nov 2024 09:38:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tD5gr-0000FK-GG; Mon, 18 Nov 2024 12:37:33 -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 ) id 1tD5gV-0008Gh-Vi for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:14 -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 ) id 1tD5gT-0004n4-5f for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:10 -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-568-ruSFp_pMOMK8Dwwe-Zgr0Q-1; Mon, 18 Nov 2024 12:37:03 -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 1ACD71954ADF; Mon, 18 Nov 2024 17:37:01 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.53]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 10EEC195DF81; Mon, 18 Nov 2024 17:36:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731951427; 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=9kniq6o51rC52CTgEXZF2VX5mVrF5y8QD9cn/IfAcJw=; b=Ysq7iVnkjoF8xfZ95Rul9FMk0NgrKQqPi/13GDPlnrRvCmc9MLLl1GkPNOYk7NBzAp25Wv XaXhZ+zTACi9RBHRz2ucr97C0FtgsKociFJ2e13aGdr6uH66hnxxCw6GWN8+s0FV5TMQjV GR8VxSzTOOJR/Oh3nBBzgbyzMjIZ734= X-MC-Unique: ruSFp_pMOMK8Dwwe-Zgr0Q-1 X-Mimecast-MFC-AGG-ID: ruSFp_pMOMK8Dwwe-Zgr0Q From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Jared Rossi Subject: [PULL 08/12] pc-bios/s390x: Initialize cdrom type to false for each IPL device Date: Mon, 18 Nov 2024 18:36:30 +0100 Message-ID: <20241118173634.473532-9-thuth@redhat.com> In-Reply-To: <20241118173634.473532-1-thuth@redhat.com> References: <20241118173634.473532-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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.142, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1731951490935116600 Content-Type: text/plain; charset="utf-8" From: Jared Rossi Clear information about cdrom type so that current IPL device isn't tainted by stale data from previous devices. Signed-off-by: Jared Rossi Reviewed-by: Thomas Huth Message-ID: <20241108194136.2833932-1-jrossi@linux.ibm.com> Signed-off-by: Thomas Huth --- pc-bios/s390-ccw/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index a4d1c05aac..7509755e36 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -242,6 +242,7 @@ static bool find_boot_device(void) static int virtio_setup(void) { VDev *vdev =3D virtio_get_device(); + vdev->is_cdrom =3D false; int ret; =20 switch (vdev->senseid.cu_model) { --=20 2.47.0 From nobody Sat Nov 23 18:02:54 2024 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=1731951530; cv=none; d=zohomail.com; s=zohoarc; b=AjmEkYwpqnDvEsfbxNnVk2q52aVjPwfnJCI3qtOoYaYhPg3rbqlliTbx70AQiPBSjIMLTxnJDDJHEw2FKhoi03+TJtjSsMyPT3WJSOVLs/PdhvjkT6fqzVZPdbIDkWTd8zumzyHmK7IUVeiUpjdkzVwwWRQCXV9WGC6lLStBKPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731951530; 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=TX7LOrpygOiAL+IAvnD6KS3fiwJAom3MdueypHbDqfU=; b=jenX0V7X6roLD3CmDK1tXjjmzrXPAsmJldg5BN/H+Hhok9KAU5tGFzloKa3747GnW8kgGT8rpdzpV3pqMRyBdwkdALblzfZO/Zex+Va/ErCr3eafipi8ML1gfdz3CDmoYCWyut3Mvc2yOJmkXJWtRlc2dBziO7oQ8E7mP/rabaY= 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 1731951530886632.0580752519165; Mon, 18 Nov 2024 09:38:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tD5gt-0000T5-UW; Mon, 18 Nov 2024 12:37:35 -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 ) id 1tD5gX-0008H1-Nu for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:15 -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 ) id 1tD5gW-0004ot-At for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:13 -0500 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-316-OjNk8Mg0PGSju6YsAOWmew-1; Mon, 18 Nov 2024 12:37:05 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 763551936125; Mon, 18 Nov 2024 17:37:03 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.53]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 97D7C195E481; Mon, 18 Nov 2024 17:37:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731951431; 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=TX7LOrpygOiAL+IAvnD6KS3fiwJAom3MdueypHbDqfU=; b=ig3f0oDWQEUf5ChVqVUCGbvwszBO6y/2/ulMWxm6iz1tv1vxdT6DCg4/tZ+fCYsVL36DQE A8ExJGBS0id1NLEf4Zy0z8Q3YODWHjUA+5Dg1Sswd3kRXKn9mENO/u/NJQK3BG0+3MqrrW Dmn7MdUutGp3gpH5DMCFu9t7F+b4rsU= X-MC-Unique: OjNk8Mg0PGSju6YsAOWmew-1 X-Mimecast-MFC-AGG-ID: OjNk8Mg0PGSju6YsAOWmew From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Jared Rossi Subject: [PULL 09/12] pc-bios/s390x: Initialize machine loadparm before probing IPL devices Date: Mon, 18 Nov 2024 18:36:31 +0100 Message-ID: <20241118173634.473532-10-thuth@redhat.com> In-Reply-To: <20241118173634.473532-1-thuth@redhat.com> References: <20241118173634.473532-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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.142, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1731951532979116600 Content-Type: text/plain; charset="utf-8" From: Jared Rossi Commit bb185de423 ("s390x: Add individual loadparm assignment to CCW device") allowed boot devices to be assigned a loadparm value independe= nt of the machine value, however, when no boot devices are defined, the machine loadparm becomes ignored. Therefore, let's check the machine loadparm prior to probing the devices. Signed-off-by: Jared Rossi Reviewed-by: Thomas Huth Message-ID: <20241114161952.3508554-1-jrossi@linux.ibm.com> Signed-off-by: Thomas Huth --- pc-bios/s390-ccw/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index 7509755e36..76bf743900 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -191,7 +191,7 @@ static void boot_setup(void) { char lpmsg[] =3D "LOADPARM=3D[________]\n"; =20 - if (memcmp(iplb.loadparm, NO_LOADPARM, LOADPARM_LEN) !=3D 0) { + if (have_iplb && memcmp(iplb.loadparm, NO_LOADPARM, LOADPARM_LEN) !=3D= 0) { ebcdic_to_ascii((char *) iplb.loadparm, loadparm_str, LOADPARM_LEN= ); } else { sclp_get_loadparm_ascii(loadparm_str); @@ -316,6 +316,7 @@ void main(void) css_setup(); have_iplb =3D store_iplb(&iplb); if (!have_iplb) { + boot_setup(); probe_boot_device(); } =20 --=20 2.47.0 From nobody Sat Nov 23 18:02:54 2024 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=1731951486; cv=none; d=zohomail.com; s=zohoarc; b=XmeZqMxflATkE97IfIHIBf2PODqKWfyecl87Tst1t3O9hxZRKTPBRi26rLGmNRuqSWLxXIPi6jAa4Nfr6iXbk8/n9q+8GaZ3/rTn1DHrdijqSQjav3dJzcxDFLRXO0As2s6fMWVcRH3uxveI1JjufPBPKCg6Q06I2i8tBeJq4Dk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731951486; 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=gvIQT+2w9sGeDTdWfjHcBkeWv2HdmhwOO1mmaSB0vpc=; b=CXpaALlvupWi6TsHSE5jzed0ElWGzRKZOpIZReQaIVCi1BUlKe4YwZPnvKc6hG/0cxtvGuHra6E6tpbAzRUMnaeiMEzpgfW4AY5qmDfR0ggp+NYSnHfpASshslrboc096+YT12rac91Y6HTmZ+CxJDQmyUIDAlsPuWA1Ycd0njo= 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 173195148659141.11854230077097; Mon, 18 Nov 2024 09:38:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tD5gs-0000OV-T2; Mon, 18 Nov 2024 12:37:35 -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 ) id 1tD5gY-0008HE-Ka for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:16 -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 ) id 1tD5gX-0004oy-79 for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:14 -0500 Received: from mx-prod-mc-02.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-694-rb-GO3UKPi2ZklGQk_VHWw-1; Mon, 18 Nov 2024 12:37:09 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3681B1977327; Mon, 18 Nov 2024 17:37:06 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.53]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CD2ED195E48B; Mon, 18 Nov 2024 17:37:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731951432; 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=gvIQT+2w9sGeDTdWfjHcBkeWv2HdmhwOO1mmaSB0vpc=; b=e0i7dc2BOngbedqwfJzZqdOt4AZ0fD+a8Y6DdyotKSl5ijXDzeOWxyeTaDSAUNietiBwxY F5WxMxA6lv6PlUO1WHEGjbPK6hAFbytSpDXiFQl3nLL4upWeM3YpPKk5HffqmUkVm8NJHl W0px1GukiMrr4LuTXT6zVJ87RciJe9s= X-MC-Unique: rb-GO3UKPi2ZklGQk_VHWw-1 X-Mimecast-MFC-AGG-ID: rb-GO3UKPi2ZklGQk_VHWw From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Jared Rossi Subject: [PULL 10/12] pc-bios/s390-ccw: Re-initialize receive queue index before each boot attempt Date: Mon, 18 Nov 2024 18:36:32 +0100 Message-ID: <20241118173634.473532-11-thuth@redhat.com> In-Reply-To: <20241118173634.473532-1-thuth@redhat.com> References: <20241118173634.473532-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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.142, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1731951488754116600 Content-Type: text/plain; charset="utf-8" Now that we can boot from multiple boot devices, we have to make sure to reinitialize static variables like rx_last_idx to avoid that they contain garbage data during the second boot attempt (which can lead to crashes when the code tries to access the wrong ring data). Message-ID: <20241111131120.317796-1-thuth@redhat.com> Reviewed-by: Jared Rossi Signed-off-by: Thomas Huth --- pc-bios/s390-ccw/virtio-net.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pc-bios/s390-ccw/virtio-net.c b/pc-bios/s390-ccw/virtio-net.c index f9854a22c3..578c89d0c5 100644 --- a/pc-bios/s390-ccw/virtio-net.c +++ b/pc-bios/s390-ccw/virtio-net.c @@ -51,6 +51,8 @@ int virtio_net_init(void *mac_addr) void *buf; int i; =20 + rx_last_idx =3D 0; + vdev->guest_features[0] =3D VIRTIO_NET_F_MAC_BIT; virtio_setup_ccw(vdev); =20 --=20 2.47.0 From nobody Sat Nov 23 18:02:54 2024 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=1731951468; cv=none; d=zohomail.com; s=zohoarc; b=ZQn5bZucQzomiouPtyf5FkdNOCXFQXk2OXSy2DDmQa9Jdv6mhFEq0AtmAw/pkVhZowZn5ZVC9JD+qZoVUJUx6x7J/Wdg0debjAlSqh5AU7u300mKWXiNNz5eMUN2KoKtuWK2psDfPayvqZCWifLJLX3st+tyc3O2wy3rQEAh4V0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731951468; 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=jqMC43BLsU9rdAArUrE1mY6/01F/UOB6Dv+xgarSihY=; b=ZzYLUk9oZUOhAq64P5XK48GzAtY/lQyxKbEod5QP4WFHauBIEhk++OyadA7sk2gq5WotKFabwWbF/LtmarF/xKcaLq1Fm6k1Ytt5SoeqqiOAkMELGPwpV+FiT/fqg8Mbx8p3VL+jY5IdZzBaFlyAe7fFxQ/yRSlZORk9uYf4pl0= 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 1731951468255607.2182655193199; Mon, 18 Nov 2024 09:37:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tD5gw-0000iP-BP; Mon, 18 Nov 2024 12:37:38 -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 ) id 1tD5gg-0008QI-GB for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:22 -0500 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 1tD5gc-0004qr-K2 for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:22 -0500 Received: from mx-prod-mc-03.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-259-Q8AXrhSnPQ-5YvW1fcqaVA-1; Mon, 18 Nov 2024 12:37:14 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9B5651933143; Mon, 18 Nov 2024 17:37:08 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.53]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4793E195E481; Mon, 18 Nov 2024 17:37:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731951438; 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=jqMC43BLsU9rdAArUrE1mY6/01F/UOB6Dv+xgarSihY=; b=MlJ/THS4qc/MVu6hYVb7QaMfrHHdbmvbIihCSMKnfd1zZ3D18/osVyhUjnB1P/sHHuXBs7 A3xmdGEwMTfgnKalWx5oJR6zYmstOaMTLvaeZxb9Y3nSmrCrdj+JQ4Aq7ds1q2av5JqGw+ PHpP2INHwHn44hDPxp/Eq4VRDA6Qh+0= X-MC-Unique: Q8AXrhSnPQ-5YvW1fcqaVA-1 X-Mimecast-MFC-AGG-ID: Q8AXrhSnPQ-5YvW1fcqaVA From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 11/12] pc-bios: Update the s390 bios images with the recent fixes Date: Mon, 18 Nov 2024 18:36:33 +0100 Message-ID: <20241118173634.473532-12-thuth@redhat.com> In-Reply-To: <20241118173634.473532-1-thuth@redhat.com> References: <20241118173634.473532-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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.142, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1731951468608116600 Content-Type: text/plain; charset="utf-8" Add the fixes from the previous three commits to the binary, too. Signed-off-by: Thomas Huth --- pc-bios/s390-ccw.img | Bin 79608 -> 79608 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/pc-bios/s390-ccw.img b/pc-bios/s390-ccw.img index f9bac253066d71b64659a76d216e04040a365355..0cbedf0fa65fb87a9e19b3bcf0c= 4b81002801b5c 100644 GIT binary patch delta 16562 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 MJq{Ek@eTZc0M`+mjsO4v delta 16511 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 (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 1731951546423597.1086421251096; Mon, 18 Nov 2024 09:39:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tD5gu-0000X5-Cx; Mon, 18 Nov 2024 12:37:36 -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 ) id 1tD5gk-0008SY-4M for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:29 -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 ) id 1tD5gh-0004tU-F6 for qemu-devel@nongnu.org; Mon, 18 Nov 2024 12:37:25 -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-620-7gN5xAeePxOAii7t3Hk-jA-1; Mon, 18 Nov 2024 12:37:16 -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 BB8F7192E27A; Mon, 18 Nov 2024 17:37:09 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.53]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 567E4196AFD6; Mon, 18 Nov 2024 17:37:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731951442; 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=g/nRngikM8XwlZ3uc1cXGcgJ7UePav7UZ6qewh34zPI=; b=XvxrcYO5bvWCh+bA+ij1htLSR/p11z84Jn0CrbLsMVfKv60u4+T5REl8Z4IITAsaWdu+XX 7jy07s7XFxinnoLyFqIOIB6lcZgYxNOeoU+HTFMnFyIhdMVT0s63EVlAXWGOnUFIX9lHnT +VpBqIt4ZsKjJV+Da4u4pcUznj0shaI= X-MC-Unique: 7gN5xAeePxOAii7t3Hk-jA-1 X-Mimecast-MFC-AGG-ID: 7gN5xAeePxOAii7t3Hk-jA From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 12/12] .gitlab-ci.d: Raise timeout on cross-accel build jobs to 60m Date: Mon, 18 Nov 2024 18:36:34 +0100 Message-ID: <20241118173634.473532-13-thuth@redhat.com> In-Reply-To: <20241118173634.473532-1-thuth@redhat.com> References: <20241118173634.473532-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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.142, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1731951547114116600 Content-Type: text/plain; charset="utf-8" From: Peter Maydell The current 30 minute timeout on the cross_accel_build_job template is a bit low: sometimes if the k8s runners are running slow the can hit it, for example this cross-arm64-xen-only job hit the 30 minute timeout while still not quite finished with the compile: https://gitlab.com/qemu-project/qemu/-/jobs/8401277985 This is partly a "runner performance can be unpredictable" issue: https://gitlab.com/qemu-project/qemu/-/jobs/8391726482 is the same job from just a day earlier and it finished in 16 minutes. But we already have build jobs that are higher timeouts than 30 minutes, so we have headroom to raise the timeout here to something we're less likely to hit on a slow runner. Bump the cross_accel_build_job timeout to 60 mins. Signed-off-by: Peter Maydell Message-ID: <20241118153226.1524542-1-peter.maydell@linaro.org> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- .gitlab-ci.d/crossbuild-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild= -template.yml index 45a9810355..303943f818 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -57,7 +57,7 @@ extends: .base_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG - timeout: 30m + timeout: 60m cache: paths: - ccache/ --=20 2.47.0