From nobody Sat Nov 15 22:25:05 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1746200569; cv=none; d=zohomail.com; s=zohoarc; b=Oxes1t+QjX703URGC2trZXm+bbSzRBdj4P+OS90GzJ264uz5boNj9ag5d9vprmIe8faIyW65R6F+XrCsG55qinIYWSldBUmuzCJh4eNr8DB+yBG13mNUwrNvp5RcKfTwdppVy66XR8QJex9gDhb4aVnciH8zOvdwxGsY/l4sQj0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746200569; 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=nQ62A3MCY62mWXW1oMyGxVt/pkkUQ6ezdwuuGxH7Rf0=; b=mPR06o0FYEbSJ6qThs3yZAUt9iOP0Q5BwqkjE03IC1aNvzpQJLMfYD82Dyvheuqjqa0nUqz3vUEOlxydaF49fwBg0fDUf+/6nbC3DOBfJfdrAgcDvRK5x5THS+Lkjn2hJOFhubnhfabdfJwe5VTIOlzS8AsyacC+snZduTC3G9I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746200569379956.2229740876058; Fri, 2 May 2025 08:42:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAsW9-0003sQ-D7; Fri, 02 May 2025 11:41:37 -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 1uAsW7-0003rW-Tp for qemu-devel@nongnu.org; Fri, 02 May 2025 11:41:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uAsW5-0005Eh-V8 for qemu-devel@nongnu.org; Fri, 02 May 2025 11:41:35 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-683-AgDLWm4jO0yDzJvc3Qxj4w-1; Fri, 02 May 2025 11:41:31 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-39130f02631so612107f8f.2 for ; Fri, 02 May 2025 08:41:31 -0700 (PDT) Received: from [192.168.10.48] ([151.95.54.106]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a099b172b3sm2475103f8f.90.2025.05.02.08.41.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 May 2025 08:41:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746200493; 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=nQ62A3MCY62mWXW1oMyGxVt/pkkUQ6ezdwuuGxH7Rf0=; b=QoDyD+bVInjGR6dBVOLn6cXASNa0aRB9nTcFegwEKm4YYnv8DzAe4Ed596Iylv242obzpz v48jFYkSxnSijm2dCvBCWvVigDxZGkY6r6/quuAk2b+tDYHnVeTiX6eVxNzWGU5akkocVI l1DmU/BLODIWusGEH+oU++C45TulX6U= X-MC-Unique: AgDLWm4jO0yDzJvc3Qxj4w-1 X-Mimecast-MFC-AGG-ID: AgDLWm4jO0yDzJvc3Qxj4w_1746200490 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746200490; x=1746805290; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nQ62A3MCY62mWXW1oMyGxVt/pkkUQ6ezdwuuGxH7Rf0=; b=HGagCO6tvRdwPgCKtCLuxuhcM+xUR2FpXgOVrzfr/cBBciV+NPIZ/+WBV3yxn0Karf a8h1hGEK/hJ5HQjfDVYLJddqGZVwMB/CwNeSRaIr7A0nd+930jmPbmc8Tjhu3TgfPIBc KJ6FV6KPnEtfsedvx8xYPcg28JGq7zINDPMhRZHTZ+OAWtZUmD1Iky3TtKmHqP3pBVMc gLyPnE6ZGbFv6tYVwEq9zt8QqOp4FnVPMxgZ+5HGJ08RIsMC8a7OWAJrarIvQ+NnJCn1 XEy3KwNgkV0FXTjH8gQ90uLDvlWBXpderKwyOSXAXN8hm8XkfuUNw5Yk2lDUJpmnTtMA kpHQ== X-Gm-Message-State: AOJu0Yz6O8ARPYSLyf8HyqhTV83ffJp6YwebwYNbzolQAWJa/lkUMEFl J0t/FqcIDN/bXVGEhxcJeB37qMG1nPJ5rq7rXtBQkLALVk124zGJHN8MuLa1t8mDdaLk94nvHKm ZAenKvSwE96zEmloN6zvBLvJPOLUVUpj+QZJ4jMOkHnc5y7HLo5P2jlQQkd0XSC4CIMuxLVgEp+ 164m1llMa8TkG9NikBFGJ3dpHB07qBkH5BhYOX X-Gm-Gg: ASbGnctQRt5HhHn8+pjyvWGOwZTs8GdKpH5qdE6y+i/ZVAyB5InirpG2oy1uUG8DEoa xP8y/w/u1VY1IiIBp01xYD1BaQ/jVELXdm+Tcok8Dt4+eesi6yu4g2e5BFhVATRTsoNRirO6j3V QNfSL/6HcO5JOQDdWWTyjeyhvA9Yd2K7H+VunPkuQ9fX54j1SAZ7W/Jomnk+Z3WUkvc0n18dDDs NaO93a2k7yd0Gc/AE+Aryz1vMog5MfD4hcCoQeRyzjo8VUEQSxDfU9u71+lLLYlE1P4+CJ0RKMQ N3hmcCbwF74fGgc= X-Received: by 2002:a05:6000:1845:b0:3a0:7b05:cfe4 with SMTP id ffacd0b85a97d-3a099ad1c2dmr3177279f8f.11.1746200489707; Fri, 02 May 2025 08:41:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEOZkRfJQVLpqouOYaFNVU4e0GibYdToVMW/hs+nHfuVAbtrJRAFPah2Qbq6TFVlitu6IbQNg== X-Received: by 2002:a05:6000:1845:b0:3a0:7b05:cfe4 with SMTP id ffacd0b85a97d-3a099ad1c2dmr3177256f8f.11.1746200489316; Fri, 02 May 2025 08:41:29 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org Subject: [PATCH 1/2] target/i386: do not trigger IRQ shadow for LSS Date: Fri, 2 May 2025 17:41:24 +0200 Message-ID: <20250502154125.152090-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250502154125.152090-1-pbonzini@redhat.com> References: <20250502154125.152090-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.644, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1746200571898116600 Content-Type: text/plain; charset="utf-8" Because LSS need not trigger an IRQ shadow, gen_movl_seg can't just use the destination register to decide whether to inhibit IRQs. Add an argument. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- target/i386/tcg/translate.c | 27 ++++++++++++++++----------- target/i386/tcg/emit.c.inc | 4 ++-- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 8a641951cd1..a4e935b043b 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -2026,27 +2026,32 @@ static void gen_op_movl_seg_real(DisasContext *s, X= 86Seg seg_reg, TCGv seg) =20 /* move SRC to seg_reg and compute if the CPU state may change. Never call this function with seg_reg =3D=3D R_CS */ -static void gen_movl_seg(DisasContext *s, X86Seg seg_reg, TCGv src) +static void gen_movl_seg(DisasContext *s, X86Seg seg_reg, TCGv src, bool i= nhibit_irq) { if (PE(s) && !VM86(s)) { TCGv_i32 sel =3D tcg_temp_new_i32(); =20 tcg_gen_trunc_tl_i32(sel, src); gen_helper_load_seg(tcg_env, tcg_constant_i32(seg_reg), sel); - /* abort translation because the addseg value may change or - because ss32 may change. For R_SS, translation must always - stop as a special handling must be done to disable hardware - interrupts for the next instruction */ - if (seg_reg =3D=3D R_SS) { - s->base.is_jmp =3D DISAS_EOB_INHIBIT_IRQ; - } else if (CODE32(s) && seg_reg < R_FS) { + + /* For move to DS/ES/SS, the addseg or ss32 flags may change. */ + if (CODE32(s) && seg_reg < R_FS) { s->base.is_jmp =3D DISAS_EOB_NEXT; } } else { gen_op_movl_seg_real(s, seg_reg, src); - if (seg_reg =3D=3D R_SS) { - s->base.is_jmp =3D DISAS_EOB_INHIBIT_IRQ; - } + } + + /* + * For MOV or POP to SS (but not LSS) translation must always + * stop as a special handling must be done to disable hardware + * interrupts for the next instruction. + * + * DISAS_EOB_INHIBIT_IRQ is a superset of DISAS_EOB_NEXT which + * might have been set above. + */ + if (inhibit_irq) { + s->base.is_jmp =3D DISAS_EOB_INHIBIT_IRQ; } } =20 diff --git a/target/i386/tcg/emit.c.inc b/target/i386/tcg/emit.c.inc index e3166e70a5b..1a7fab9333a 100644 --- a/target/i386/tcg/emit.c.inc +++ b/target/i386/tcg/emit.c.inc @@ -342,7 +342,7 @@ static void gen_writeback(DisasContext *s, X86DecodedIn= sn *decode, int opn, TCGv break; case X86_OP_SEG: /* Note that gen_movl_seg takes care of interrupt shadow and TF. = */ - gen_movl_seg(s, op->n, s->T0); + gen_movl_seg(s, op->n, v, op->n =3D=3D R_SS); break; case X86_OP_INT: if (op->has_ea) { @@ -2382,7 +2382,7 @@ static void gen_lxx_seg(DisasContext *s, X86DecodedIn= sn *decode, int seg) gen_op_ld_v(s, MO_16, s->T1, s->A0); =20 /* load the segment here to handle exceptions properly */ - gen_movl_seg(s, seg, s->T1); + gen_movl_seg(s, seg, s->T1, false); } =20 static void gen_LDS(DisasContext *s, X86DecodedInsn *decode) --=20 2.49.0 From nobody Sat Nov 15 22:25:05 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1746200551; cv=none; d=zohomail.com; s=zohoarc; b=MCJmd/uUX8ExOYeyZUn+6xYPRzc22WZ54cnhkR0WVQX64OSb2AEDsgTu3PRefALpJPBaBW5J4Py9srqeJcoQhmdDpdLnH13PHoPlV5Hf9B3wqbrSBmRsNPQkhSftcQTA7S7TtIg5Ya00G/CFr7vVUXyzyTT+qV8xjmwVmFrlA8E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746200551; 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=mq+ksrrzmRU5e3CQiDfdSG+3l9vDGDH9VPK5MruBMrk=; b=FbHjRiFWHl6JFiXETMy3G2celh/bpk7kVeNwvWkCzAT62oWyD4kqYeznE3RJI2yvQVZytrA4xFJ9tVGTsUu36MYD9E0EluF1jkgBacK4nd/QfPAggqgZF2ieu9RRud/y/g5y/CjTbBs/eQUJl+trk/2D3kTMSloP3npiacBiNzQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746200551199845.591584643561; Fri, 2 May 2025 08:42:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAsWB-0003tM-TS; Fri, 02 May 2025 11:41:39 -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 1uAsW9-0003sn-IZ for qemu-devel@nongnu.org; Fri, 02 May 2025 11:41:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uAsW7-0005FN-UX for qemu-devel@nongnu.org; Fri, 02 May 2025 11:41:37 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-183-xypc1sOPMZeVKBYHdAuuSA-1; Fri, 02 May 2025 11:41:34 -0400 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-39126c3469fso629697f8f.3 for ; Fri, 02 May 2025 08:41:33 -0700 (PDT) Received: from [192.168.10.48] ([151.95.54.106]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a099ae0cc9sm2435177f8f.9.2025.05.02.08.41.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 May 2025 08:41:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746200495; 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=mq+ksrrzmRU5e3CQiDfdSG+3l9vDGDH9VPK5MruBMrk=; b=AcpomNyWbPY0BYIgV3h7Rvg4vDRROX3FccTf/a276qaBLk8+JAMfg08OUVTmzBqJmbLTOX d+lVq0I8A5r2kUe8NTw8f301sY0U/Fgu1C6Ds96FaQ8oU3yoXQjxamb7vTjAEVFRVNw/9H +7w66WNIA8gZIABjVJzvYrYoQXZ9API= X-MC-Unique: xypc1sOPMZeVKBYHdAuuSA-1 X-Mimecast-MFC-AGG-ID: xypc1sOPMZeVKBYHdAuuSA_1746200493 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746200492; x=1746805292; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mq+ksrrzmRU5e3CQiDfdSG+3l9vDGDH9VPK5MruBMrk=; b=soDoJHBsbuoENH0btLFKq1D3JjUJmavxk3yXOWuXK7NGcz7MeMYwSHJG1WamwLKD76 9o5Br7LRsMdPPsDSyMTzd1GJyvx0j6Q41CPXMxhd3bdYOjSnbtizvDXkYgBz9KpIQ12a 9vv0hnY1srnAyqC+zepKKMZs5vTtIi/rDmg6pwCujkssYE+zW8dFXG4s3yAqnDIJQbe4 WudgLQl54lCfH5IDadaonX63L4EGLTapVAe0O081cD9JULN36ctD+mYnjoiffZWXA+1G MDSGEk0zMfiQiwFPtxEirD4vlnsvx+vkSoz1jqDaV2ruLi+zSGTUcB8c7FHyVqUyJmz4 G9Yw== X-Gm-Message-State: AOJu0YzGF2YGRl3JG3oHaj++eaGsbWX9zF6PqpdYupN4SBuPd+2LQAre A/tNSLDGH6dRn9LcAleVr5+arlOtgB8jYI2x8QhR26byF9MLq/AyA3oDgcPJdM381wbG1WG6rhN Hy5gYmfU1cVc3+M7XRvtjUy4BBFHkElYpLCcvnNLQZhK3dZxi2zCY3AMum1q/9IvdP7jcMAyARj AyHB0uuDRAcQvhXcNG0VhOOm3xp4bs5iaHy6IY X-Gm-Gg: ASbGncthqF4p8qOOceO3eDePgujkR6sW4G0+bEy+dto/d77SmbJc0FZ89tqp/VR7ugo 3oN2eapjWhs0f5Rh3n68nXA3DiwWQamzUUv6HBzSaxxS9l44YIPsIE4XCWEeecv9CHLhqYzWD8o /fixWPQbiIVZbVlS0Hq8XjEVKnHxrNoSt3SeM6aDYx/I4VIPu38PF4Jo1lZMhFAU7pItpwRObn9 8NzXRW7S1eVDaRkk5Opgcd01fbz/LgWqUiDHKg6xcn0qHWzkD4/sr53MQ2slgM3xiA0p2nm+wEW iZrFviYZI3KQTxU= X-Received: by 2002:a05:6000:40db:b0:39f:efb:c2f6 with SMTP id ffacd0b85a97d-3a099adcb13mr2468132f8f.33.1746200492240; Fri, 02 May 2025 08:41:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFGS7iLLAlsD7SjMZLl0Y4ur9Z12e72C3wCiW0Pf1FKLDQrwprdBD1vQ/TEhZbvMOP5WU1SZA== X-Received: by 2002:a05:6000:40db:b0:39f:efb:c2f6 with SMTP id ffacd0b85a97d-3a099adcb13mr2468104f8f.33.1746200491787; Fri, 02 May 2025 08:41:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org Subject: [PATCH 2/2] target/i386: do not block singlestep for STI Date: Fri, 2 May 2025 17:41:25 +0200 Message-ID: <20250502154125.152090-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250502154125.152090-1-pbonzini@redhat.com> References: <20250502154125.152090-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.644, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1746200552454019000 Content-Type: text/plain; charset="utf-8" STI will trigger a singlestep exception even if it has inhibit-IRQ behavior. Do not suppress single-step for all IRQ-inhibiting instructions, instead special case MOV SS and POP SS. Cc: qemu-stable@nongnu.org Fixes: f0f0136abba ("target/i386: no single-step exception after MOV or POP= SS", 2024-05-25) Signed-off-by: Paolo Bonzini --- target/i386/tcg/translate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index a4e935b043b..ed43c95c1d9 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -2047,11 +2047,15 @@ static void gen_movl_seg(DisasContext *s, X86Seg se= g_reg, TCGv src, bool inhibit * stop as a special handling must be done to disable hardware * interrupts for the next instruction. * + * This is the last instruction, so it's okay to overwrite + * HF_TF_MASK; the next TB will start with the flag set. + * * DISAS_EOB_INHIBIT_IRQ is a superset of DISAS_EOB_NEXT which * might have been set above. */ if (inhibit_irq) { s->base.is_jmp =3D DISAS_EOB_INHIBIT_IRQ; + s->flags &=3D ~HF_TF_MASK; } } =20 @@ -2302,7 +2306,7 @@ gen_eob(DisasContext *s, int mode) if (mode =3D=3D DISAS_EOB_RECHECK_TF) { gen_helper_rechecking_single_step(tcg_env); tcg_gen_exit_tb(NULL, 0); - } else if ((s->flags & HF_TF_MASK) && mode !=3D DISAS_EOB_INHIBIT_IRQ)= { + } else if (s->flags & HF_TF_MASK) { gen_helper_single_step(tcg_env); } else if (mode =3D=3D DISAS_JUMP && /* give irqs a chance to happen */ --=20 2.49.0