From nobody Fri Nov 14 18:19:18 2025 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1760616689; cv=none; d=zohomail.com; s=zohoarc; b=Qw+6pak5ov8wofw0owa6lPX8kjGEaRpNcTup8OCuwWxaMClwuPphSXqaAerk2AGin7r0o3LYFdA34Z9XWZaNL1PkgTg7jQB97OecIsLixMqs7SLVM/SM51O/y2Fb4YCdRoNv7TP/kddRcrYO9fP3U4CmV1I6Q4KSkudNyKiLnqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760616689; 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=VsSOpe6pgGj5wbRdO8x5We83G5GYrOJq7kqoOz19YGc=; b=aTIg2lZkZ1/t7Qer0FkpEwVCi5AwFdPVW+1NuzygzqsMDjazKzPqOz8+GAEwqxfrqpgZb09yzclM/ysGeemU0eU0HYFPY/E1VRLZMlTqK3fRcit2zHoUHe1fyzorOU9gH9C8IGyW55Fld4GjZyu067sR60Y9cPEG7CXnQ9YWZbc= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176061668975128.752358358520155; Thu, 16 Oct 2025 05:11:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9MoQ-00010t-5Y; Thu, 16 Oct 2025 08:10:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9Mnv-0000iz-GG; Thu, 16 Oct 2025 08:10:01 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9Mnl-0006yY-Jm; Thu, 16 Oct 2025 08:09:59 -0400 Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59G7QIt7023571; Thu, 16 Oct 2025 12:09:35 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49tfxpm8bh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Oct 2025 12:09:35 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 59GA9fCc003603; Thu, 16 Oct 2025 12:09:34 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 49r1xy5ntd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Oct 2025 12:09:34 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 59GC9WHq50463160 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Oct 2025 12:09:32 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 70FF920175; Thu, 16 Oct 2025 12:09:32 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EC21620174; Thu, 16 Oct 2025 12:09:31 +0000 (GMT) Received: from heavy.ibm.com (unknown [9.111.71.186]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 16 Oct 2025 12:09:31 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=VsSOpe6pgGj5wbRdO 8x5We83G5GYrOJq7kqoOz19YGc=; b=TWCBkSUgeuDo1B7UGh8HzHN2WLk4MgUuU 4cRaiLdxj2ngI8CYz+jRxENhMIX782fjo9RVgIAgla07GvMQPC/r26AkXp3MKQVG Cp6fMZRdm2m/vyO7moD6H+bWo4g06aQbnnp2XFOWokqD4fLMUqr+sB7/bNXIm1Bo cTLFlUAUNc3HuuTLrqpm5Ti1CWGY5w3+feoGACyhy9drkEKF/YFZJoa66cGXdJ3H 9foiRTSq9MlVXl//p/b6JDrKaAAgZMILVRBtm4hoqaSuRVd7SqhI0vqWmEqTjfpg TZqZTk0oZv3DmkjbD9/Br32ak0eADDzPZXSczvWB1Cl0CetZWsjCg== From: Ilya Leoshkevich To: Thomas Huth , Richard Henderson , David Hildenbrand Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Ilya Leoshkevich , qemu-stable@nongnu.org Subject: [PATCH v3 1/3] target/s390x: Fix missing interrupts for small CKC values Date: Thu, 16 Oct 2025 14:06:59 +0200 Message-ID: <20251016120928.22467-2-iii@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251016120928.22467-1-iii@linux.ibm.com> References: <20251016120928.22467-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: EyAZp_AL_7BSIwUpTdqEF9AfPUubHlsY X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDE1MDEyNSBTYWx0ZWRfX8u/8fTahZyqQ I69DD4F80ob7UgzEdrLYam9ZYKmhVVlubgVrWXGRY1Z4DORa1fmTZUveoqu4XAFOCbhNWt51cpw AKsTwX8gU6K9xNV5Yg4LPApAzSPed7qv2YhGMqjZAuxLMKUzVuqmENQc12ChBqirVDgQQQpWYf0 ide9eDGX3i7N3BCrJWH/UD0UAixfKK8gSfejo+3ZFZaAGDWsiDpXp45Gz72WCjVpj52lDV6GnA3 Krgo9uBBcyN/PVuUQsapoy/Xo4991BACzS/ElmKn1cWnWPv03gldjV1vDS9LikosA0YVSAPiVYv lmfLoxvB+PRSW15ixR5eQi6XmULD0LpMmE1krUx0TZrsAbIfL4WZ1zM4FcB1X4ja19yG3KTGC9H g7FBIEdSqXBk7GjUeoFn0JAV68qSzA== X-Authority-Analysis: v=2.4 cv=R+wO2NRX c=1 sm=1 tr=0 ts=68f0e07f cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=69wJf7TsAAAA:8 a=20KFwNOVAAAA:8 a=VnNF1IyMAAAA:8 a=DMoVdRysFPNM0ZNGwSsA:9 a=Fg1AiH1G6rFz08G2ETeA:22 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-ORIG-GUID: EyAZp_AL_7BSIwUpTdqEF9AfPUubHlsY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-16_02,2025-10-13_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 suspectscore=0 bulkscore=0 clxscore=1015 priorityscore=1501 adultscore=0 spamscore=0 impostorscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510020000 definitions=main-2510150125 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=148.163.158.5; envelope-from=iii@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=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 @ibm.com) X-ZM-MESSAGEID: 1760616691782154100 Content-Type: text/plain; charset="utf-8" Suppose TOD clock value is 0x1111111111111111 and clock-comparator value is 0, in which case clock-comparator interruption should occur immediately. With the current code, tod2time(env->ckc - td->base.low) ends up being a very large number, so this interruption never happens. Fix by firing the timer immediately if env->ckc < td->base.low. Cc: qemu-stable@nongnu.org Reviewed-by: Thomas Huth Signed-off-by: Ilya Leoshkevich --- target/s390x/tcg/misc_helper.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c index 6d9d601d29a..215b5b9d933 100644 --- a/target/s390x/tcg/misc_helper.c +++ b/target/s390x/tcg/misc_helper.c @@ -199,11 +199,15 @@ static void update_ckc_timer(CPUS390XState *env) return; } =20 - /* difference between origins */ - time =3D env->ckc - td->base.low; + if (env->ckc < td->base.low) { + time =3D 0; + } else { + /* difference between origins */ + time =3D env->ckc - td->base.low; =20 - /* nanoseconds */ - time =3D tod2time(time); + /* nanoseconds */ + time =3D tod2time(time); + } =20 timer_mod(env->tod_timer, time); } --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1760616700; cv=none; d=zohomail.com; s=zohoarc; b=AmBubmxPdEUzJcvFKtifYtt3mo/Y5ocT75ezo8stE5/iq4V8UuYiZYGJHJLWsMltahmrtpFCrsJqk8SJiafXT/VW4+1Hfw6uIzeUFpKnvrUusZS8TONNWD2Fbi9p2FXe7rm2zG+sMG5x2eABm6BtR+8kBDzK3evs9sxIcYNu/xk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760616700; 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=Y2h6TdWlxVDiVfPnoYF5l9frUy5Kex2iUmuv1+WHI28=; b=ITaWh1LFt3gmUOBEd6Vsnsv9ao+ctCeZZlxhq4yYqWvXO/FEDAk0vNgONuMgGSxmapApK8DuEDWkCD8aR2bLONtJJyTz5mITAtkcSmQO++RH7N9mKxpiUy+ddhSU5HXmJNpJXjZdMauQkgwDHnxD1ieYTuTBdRk1fwJHBIxNNvE= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760616700154636.7290016014083; Thu, 16 Oct 2025 05:11:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9MoS-0001CT-22; Thu, 16 Oct 2025 08:10:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9Mo1-0000mn-Sa; Thu, 16 Oct 2025 08:10:11 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9Mnj-0006yu-Go; Thu, 16 Oct 2025 08:10:01 -0400 Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59G2HTuB010194; Thu, 16 Oct 2025 12:09:36 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49qewuagx3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Oct 2025 12:09:35 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 59GAogQ2015041; Thu, 16 Oct 2025 12:09:34 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 49r3sjnbbb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Oct 2025 12:09:34 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 59GC9X9F59179408 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Oct 2025 12:09:33 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1147820173; Thu, 16 Oct 2025 12:09:33 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8783920174; Thu, 16 Oct 2025 12:09:32 +0000 (GMT) Received: from heavy.ibm.com (unknown [9.111.71.186]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 16 Oct 2025 12:09:32 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=Y2h6TdWlxVDiVfPno YF5l9frUy5Kex2iUmuv1+WHI28=; b=NYhRUgjgy/bBwh9+cyKritAVKYp6NafhV c39bEoLlIW/7AkzouT72441upna0lg8wA2pzVQOzDem5iDgtXxPgEuj0Di+/DEZ4 Of5xb3O21mhxoyS+MlqYGoZ/lUdM3JrvXHkNe5Q0AnKWmGNeyJ7ZcmaZjI2vz1Ei LxFa31bApYRpqS04JMLors55TNRkRI1GI7n5TSP0wp99pnotthJsN1f49qHa7/ZU Z4NWkajejV/AfWv5JdsvCFZ5libvQQOjRzwMK2T8Pg8p6u10fIxHWfnWaBE01uq6 L1541u0VfqCKLblZG0LM6ndDMkmg6iTK0TtjvqNxn5u0tBWEcM5Wg== From: Ilya Leoshkevich To: Thomas Huth , Richard Henderson , David Hildenbrand Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Ilya Leoshkevich , qemu-stable@nongnu.org Subject: [PATCH v3 2/3] target/s390x: Fix missing clock-comparator interrupts after reset Date: Thu, 16 Oct 2025 14:07:00 +0200 Message-ID: <20251016120928.22467-3-iii@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251016120928.22467-1-iii@linux.ibm.com> References: <20251016120928.22467-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: B1s7OgcwQQJaaw3tZRPcTrg5Q8eQIY8I X-Authority-Analysis: v=2.4 cv=Kr1AGGWN c=1 sm=1 tr=0 ts=68f0e07f cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=69wJf7TsAAAA:8 a=20KFwNOVAAAA:8 a=VnNF1IyMAAAA:8 a=1K0trMwjMfmDt0goFSAA:9 a=Fg1AiH1G6rFz08G2ETeA:22 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-ORIG-GUID: B1s7OgcwQQJaaw3tZRPcTrg5Q8eQIY8I X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDExMDAxNCBTYWx0ZWRfX2QJArvhpb/CJ k/mqtuZjsGE8ndgllW2ZSFhSVzkNBFB5W4DtqcI4LXR6Y/8oqBNRbddOsvj7AtZJZ1kfi8iXMsL DVRdhRNSj/sHzOSk3Zq2+7m4MxyXnB390aZkD9o56VSq1MzYNZAR+MPXq5DKD59n/XOlDpGe914 56jx0l6kRW24cZhV1+r5nVeJDBmBNoXubP5dKjsK6QpX6VTsd41be/xCNrx4UZolZ3GrcMidguO eFvXYklczz2zwO86b7ZUccbegSRcaGM4ju8vFxD85YWtNuZdmspjmLMYyHz6TMQAjGyk4yp+3/s mchSfiAiooAvoAJcw3gmsduVCCjlUn/YZybSi45kERzP5Au5LqfPl/o6PD3WF05HgcBoNe1OCaH XYA4xx2Y85RJ1prBsM+y6HCIg/BhrQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-16_02,2025-10-13_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 lowpriorityscore=0 bulkscore=0 adultscore=0 phishscore=0 suspectscore=0 malwarescore=0 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510020000 definitions=main-2510110014 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=148.163.156.1; envelope-from=iii@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=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 @ibm.com) X-ZM-MESSAGEID: 1760616701851154100 Content-Type: text/plain; charset="utf-8" After reset, CKC value is set to 0, so if clock-comparator interrupts are enabled, one should occur very shortly thereafter. Currently the code that loads the respective control register does not set tod_timer, so this does not happen. Fix by adding a tcg_s390_tod_updated() call to LCTL and LCTLG. Cc: qemu-stable@nongnu.org Suggested-by: Thomas Huth Signed-off-by: Ilya Leoshkevich Reviewed-by: Thomas Huth --- target/s390x/tcg/mem_helper.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index f1acb1618f7..24675fc818d 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -1959,6 +1959,10 @@ void HELPER(lctlg)(CPUS390XState *env, uint32_t r1, = uint64_t a2, uint32_t r3) if (env->cregs[i] !=3D val && i >=3D 9 && i <=3D 11) { PERchanged =3D true; } + if (i =3D=3D 0 && !(env->cregs[i] & CR0_CKC_SC) && (val & CR0_CKC_= SC)) { + BQL_LOCK_GUARD(); + tcg_s390_tod_updated(env_cpu(env), RUN_ON_CPU_NULL); + } env->cregs[i] =3D val; HELPER_LOG("load ctl %d from 0x%" PRIx64 " =3D=3D 0x%" PRIx64 "\n", i, src, val); @@ -1989,10 +1993,15 @@ void HELPER(lctl)(CPUS390XState *env, uint32_t r1, = uint64_t a2, uint32_t r3) =20 for (i =3D r1;; i =3D (i + 1) % 16) { uint32_t val =3D cpu_ldl_data_ra(env, src, ra); + uint64_t val64 =3D deposit64(env->cregs[i], 0, 32, val); if ((uint32_t)env->cregs[i] !=3D val && i >=3D 9 && i <=3D 11) { PERchanged =3D true; } - env->cregs[i] =3D deposit64(env->cregs[i], 0, 32, val); + if (i =3D=3D 0 && !(env->cregs[i] & CR0_CKC_SC) && (val64 & CR0_CK= C_SC)) { + BQL_LOCK_GUARD(); + tcg_s390_tod_updated(env_cpu(env), RUN_ON_CPU_NULL); + } + env->cregs[i] =3D val64; HELPER_LOG("load ctl %d from 0x%" PRIx64 " =3D=3D 0x%x\n", i, src,= val); src +=3D sizeof(uint32_t); =20 --=20 2.51.0 From nobody Fri Nov 14 18:19:18 2025 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1760616685; cv=none; d=zohomail.com; s=zohoarc; b=QlGR+6+mnYDq5AFLAH4lcLzihz+68IAe5bRFRHQfvWMXfJCCf0oB9zawm87noiri949n8VXbuY6s3hp3KyjLpc4X9yPmihYWfYcyfnMaBpyzNdWx5i9qI50GqH+s7I+fc0uydsxKaUANq7XHaCss7wEgiEU7A78+3wCxlz7+jlo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760616685; 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=3FSU47RGtnCQB/ov4YA8aPN+XrcB8C07+ZWC65TGiS4=; b=TGU3wVlQNcEKMb3fabN9NvNhlk9VQZWjMQUFpDra2JAYkDd+/pPYGInGWbKrhXO5F5U0N5lVVKhXEPu0AH0hDpTjbulQk3hkwBultKSs7kYcnrGNZvi6Mb2LpLP5p7pKQjgKNKMPtW6rfLJm17Zc3GmUadYfGKhe58uJPduFGRw= 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760616685787768.5393506316265; Thu, 16 Oct 2025 05:11:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9MoK-0000wM-Vi; Thu, 16 Oct 2025 08:10:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9Mnt-0000ha-FI; Thu, 16 Oct 2025 08:09:57 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9Mnm-0006zS-HL; Thu, 16 Oct 2025 08:09:56 -0400 Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59GBnVX9021793; Thu, 16 Oct 2025 12:09:37 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49qey92hnm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Oct 2025 12:09:36 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 59GA9Lbn018812; Thu, 16 Oct 2025 12:09:35 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 49r2jmwm53-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Oct 2025 12:09:35 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 59GC9XX062259688 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Oct 2025 12:09:33 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9753C20175; Thu, 16 Oct 2025 12:09:33 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 27BB920174; Thu, 16 Oct 2025 12:09:33 +0000 (GMT) Received: from heavy.ibm.com (unknown [9.111.71.186]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 16 Oct 2025 12:09:33 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=3FSU47RGtnCQB/ov4 YA8aPN+XrcB8C07+ZWC65TGiS4=; b=DmzKNyBIMz3g2BWmJiZ1w/M68kVB+rYtp yXoU1TQ0EHqhU/oDT8lq04zYET8NBsdhFu+cAgYcJ/sdAMjnTe+C7QiR0DpPAUAU P4u7JASAetjQaLVdJ1QaxQA6zTw2DOpcY5/Q2AirnFhrbngeeFDARmGvRkhvZrt/ z0jgm5JRyNKfgGjjikYWPtuMnQt+ayo1eBoXrUuC0aJ5qgPvKcpthkCcTem4Hpug Qt9jHJ5Y3fsuHP5rslWDfDzk1Zonm/AhG+G7FqZI8n1hW0hnZizX4mQ1U0t9NwcL 1Z02hRY/rUGw6Y1o0rHmhlvLdVAcia4M7lzPpDqjspAYaOs0K3H4g== From: Ilya Leoshkevich To: Thomas Huth , Richard Henderson , David Hildenbrand Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Ilya Leoshkevich , qemu-stable@nongnu.org Subject: [PATCH v3 3/3] tests/tcg/s390x: Test SET CLOCK COMPARATOR Date: Thu, 16 Oct 2025 14:07:01 +0200 Message-ID: <20251016120928.22467-4-iii@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251016120928.22467-1-iii@linux.ibm.com> References: <20251016120928.22467-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: _KV8zhtB_UgFmH5RUCZNiTVFfbnj_CF9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDExMDAxMSBTYWx0ZWRfX+KbFsqPaN2MY lY63t3twFs5ZD+Y8XAq4pnviavW8hflf3Kj3GqzSlgqUN9QMUjp4qa0fdaGqXTj2JrWuuH71R95 Sdry60IGpObUrQCegENMJEg1d4fITcomiqP9GZGF+VicUF/adq1VxcTkEdhSaWvpCjqTKR23SZf DKCjLsWhIFb6K9mihy0shPgj6CvD1I1wN30usJDsVFNDD43MQKCidG9Cjz/8nkLbRwqDy4EusWI +1C4z2xvUmqk0nnT6IJkIpAKgY+9bKWE83Z7mkkxDJ2odr4vOqOjHsacQH8vLB74hG2BDO4YGpv Hm86xRgWsUi672Ii/TmZZne15qBjsKEQB6uzdHLGERZ47puavufZ1ToCQ4nZL8ImdaLN7u2CL9a Md+1gg78+/pF7ZuSkX+yPhb4X6layw== X-Proofpoint-GUID: _KV8zhtB_UgFmH5RUCZNiTVFfbnj_CF9 X-Authority-Analysis: v=2.4 cv=QZ5rf8bv c=1 sm=1 tr=0 ts=68f0e080 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=69wJf7TsAAAA:8 a=20KFwNOVAAAA:8 a=VnNF1IyMAAAA:8 a=H4dCiJhQUaCM5N7H5isA:9 a=Fg1AiH1G6rFz08G2ETeA:22 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-16_02,2025-10-13_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 bulkscore=0 suspectscore=0 spamscore=0 malwarescore=0 impostorscore=0 clxscore=1015 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510020000 definitions=main-2510110011 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=148.163.156.1; envelope-from=iii@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=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 @ibm.com) X-ZM-MESSAGEID: 1760616690689158500 Content-Type: text/plain; charset="utf-8" Add a small test to prevent regressions. Cc: qemu-stable@nongnu.org Reviewed-by: Thomas Huth Signed-off-by: Ilya Leoshkevich --- tests/tcg/s390x/Makefile.softmmu-target | 1 + tests/tcg/s390x/sckc.S | 55 +++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 tests/tcg/s390x/sckc.S diff --git a/tests/tcg/s390x/Makefile.softmmu-target b/tests/tcg/s390x/Make= file.softmmu-target index 8cd4667c63b..a4425d3184a 100644 --- a/tests/tcg/s390x/Makefile.softmmu-target +++ b/tests/tcg/s390x/Makefile.softmmu-target @@ -28,6 +28,7 @@ ASM_TESTS =3D = \ mc = \ per = \ precise-smc-softmmu = \ + sckc = \ ssm-early = \ stosm-early = \ stpq = \ diff --git a/tests/tcg/s390x/sckc.S b/tests/tcg/s390x/sckc.S new file mode 100644 index 00000000000..66e8733f45c --- /dev/null +++ b/tests/tcg/s390x/sckc.S @@ -0,0 +1,55 @@ +/* + * Test clock comparator. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + .org 0x130 +ext_old_psw: + .org 0x1b0 +ext_new_psw: + .quad 0x180000000, _ext /* 64-bit mode */ + .org 0x200 /* lowcore padding */ + + .globl _start +_start: + lpswe start31_psw +_start31: + stctg %c0,%c0,c0 + oi c0+6,8 /* set clock-comparator subclass ma= sk */ + lctlg %c0,%c0,c0 + jg . + +_ext: + stg %r0,ext_saved_r0 + + lg %r0,ext_counter + aghi %r0,1 + stg %r0,ext_counter + + cgfi %r0,0x1000 + jnz 0f + lpswe success_psw +0: + + stck clock + lg %r0,clock + agfi %r0,0x40000 /* 64us * 0x1000 =3D~ 0.25s */ + stg %r0,clock + sckc clock + + lg %r0,ext_saved_r0 + lpswe ext_old_psw + + .align 8 +start31_psw: + .quad 0x100000080000000,_start31 /* EX, 31-bit mode */ +success_psw: + .quad 0x2000000000000,0xfff /* see is_special_wait_psw() */ +c0: + .skip 8 +clock: + .quad 0 +ext_counter: + .quad 0 +ext_saved_r0: + .skip 8 --=20 2.51.0