From patchwork Tue Jan 23 08:48:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 765186 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:10c4:b0:337:62d3:c6d5 with SMTP id b4csp1500201wrx; Tue, 23 Jan 2024 00:53:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IHf993w+mPDTsJq3zSW95SMRK/ym7m/jQZfvO3+H/7ZgcM4Yzy9BpahRi2fQk1rO1+sDYls X-Received: by 2002:a81:5383:0:b0:5ff:6587:19fd with SMTP id h125-20020a815383000000b005ff658719fdmr4796984ywb.86.1706000032242; Tue, 23 Jan 2024 00:53:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706000032; cv=none; d=google.com; s=arc-20160816; b=MsYJx5lcY4rmO5Hqf/iPX27JgJmg12aYn1RRSifVGxtvUToTTKkLBig5589CjqNJFT fhft0bEZbhzK4/t1DaqP9ce5MXZFkDFz6uAebW/eek4wNq4e/AwYG8s+MM2dVICzXHPh MPfQOJE+JfCCSYVOBKidraxISU3lb/2MtvjTCf6N33OdAyLCeULoGZ6yHTVxUF3AVDzI rwSkhlJWIq1Wzkp8iSEiyG0t7bfgGpyAgaeJXF4d/kTu8An3lt4bWBGa93aYPaXD+ssV RxmLJW+94mebNgkWukeHA3Yx6DYDEz1y6XwP32g1AE3u4NPh/T7bu6uY/GsWYznrodPp HrpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=nTs3JYG0t4+C5RgqDw0od5F0pMImFVFgsebVfnTY7kc=; fh=73++FxpCBH5KDXgG1Nqvg9f5zGI68qj4hqVYWy1KEho=; b=dQSZuvRyHTPz6wDGNTnH+8a6JPqzvrDtH7RzHfpH7XLLCl5DtHatPwXqyXMzt9+1Eu 6X7sfQ6n3lQz2bpCWmWiecp4ofqiogxZWsFIQWQXgWsAJzm9T33vK328zwgwyXnEr4S+ jnT+Gwr+/iJ5YmbbV5mq1f5wqXIaA5tzt+IqV3/teuh/9XeVfXbMHuIidpkEP+AYQqrN AGN5r2sIgYacDrHkertjiwGMV6UmrOrnwAUJz+WHFWZT5Ile9FpwHCexOaBHxav9FqWl Rcwl9qGLQZi+JBMSFAh60ektBfS9dt3ZoVRRjMkbyW8xtp5dx0B22djh65gqlKNQn8X/ fZtQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l15-20020a0ce08f000000b006817fe7afa2si7257559qvk.298.2024.01.23.00.53.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jan 2024 00:53:52 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSCSa-0001MF-4M; Tue, 23 Jan 2024 03:48:44 -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 1rSCSX-0001LG-VZ; Tue, 23 Jan 2024 03:48:41 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rSCSV-0004tg-FN; Tue, 23 Jan 2024 03:48:41 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 80DF24666F; Tue, 23 Jan 2024 11:49:11 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 42B06699ED; Tue, 23 Jan 2024 11:48:31 +0300 (MSK) Received: (nullmailer pid 3828105 invoked by uid 1000); Tue, 23 Jan 2024 08:48:31 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Paolo Bonzini , Michael Tokarev Subject: [Stable-7.2.9 10/20] target/i386: Fix 32-bit wrapping of pc/eip computation Date: Tue, 23 Jan 2024 11:48:20 +0300 Message-Id: <20240123084831.3828060-2-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson In 32-bit mode, pc = eip + cs_base is also 32-bit, and must wrap. Failure to do so results in incorrect memory exceptions to the guest. Before 732d548732ed, this was implicitly done via truncation to target_ulong but only in qemu-system-i386, not qemu-system-x86_64. To fix this, we must add conditional zero-extensions. Since we have to test for 32 vs 64-bit anyway, note that cs_base is always zero in 64-bit mode. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2022 Signed-off-by: Richard Henderson Reviewed-by: Paolo Bonzini Message-Id: <20231212172510.103305-1-richard.henderson@linaro.org> (cherry picked from commit b5e0d5d22fbffc3d8f7d3e86d7a2d05a1a974e27) Signed-off-by: Michael Tokarev (Mjt: context fix in target/i386/tcg/tcg-cpu.c for v8.1.0-1190-gb77af26e97 "accel/tcg: Replace CPUState.env_ptr with cpu_env()") (Mjt: fixup in target/i386/tcg/tcg-cpu.c for v7.2.0-1854-g34a39c2443 "target/i386: Replace `tb_pc()` with `tb->pc`") diff --git a/target/i386/cpu.h b/target/i386/cpu.h index d4bc19577a..f67cee477a 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2217,10 +2217,15 @@ static inline int cpu_mmu_index_kernel(CPUX86State *env) static inline void cpu_get_tb_cpu_state(CPUX86State *env, target_ulong *pc, target_ulong *cs_base, uint32_t *flags) { - *cs_base = env->segs[R_CS].base; - *pc = *cs_base + env->eip; *flags = env->hflags | (env->eflags & (IOPL_MASK | TF_MASK | RF_MASK | VM_MASK | AC_MASK)); + if (env->hflags & HF_CS64_MASK) { + *cs_base = 0; + *pc = env->eip; + } else { + *cs_base = env->segs[R_CS].base; + *pc = (uint32_t)(*cs_base + env->eip); + } } void do_cpu_init(X86CPU *cpu); diff --git a/target/i386/tcg/tcg-cpu.c b/target/i386/tcg/tcg-cpu.c index 79ac5908f7..563f42ee4e 100644 --- a/target/i386/tcg/tcg-cpu.c +++ b/target/i386/tcg/tcg-cpu.c @@ -52,7 +52,12 @@ static void x86_cpu_synchronize_from_tb(CPUState *cs, /* The instruction pointer is always up to date with TARGET_TB_PCREL. */ if (!TARGET_TB_PCREL) { CPUX86State *env = cs->env_ptr; - env->eip = tb_pc(tb) - tb->cs_base; + + if (tb->flags & HF_CS64_MASK) { + env->eip = tb_pc(tb); + } else { + env->eip = (uint32_t)(tb_pc(tb) - tb->cs_base); + } } } @@ -66,8 +71,10 @@ static void x86_restore_state_to_opc(CPUState *cs, if (TARGET_TB_PCREL) { env->eip = (env->eip & TARGET_PAGE_MASK) | data[0]; + } else if (tb->flags & HF_CS64_MASK) { + env->eip = data[0]; } else { - env->eip = data[0] - tb->cs_base; + env->eip = (uint32_t)(data[0] - tb->cs_base); } if (cc_op != CC_OP_DYNAMIC) { env->cc_op = cc_op; diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 7e0b2a709a..15b030d84b 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -547,8 +547,10 @@ static void gen_update_eip_cur(DisasContext *s) assert(s->pc_save != -1); if (TARGET_TB_PCREL) { tcg_gen_addi_tl(cpu_eip, cpu_eip, s->base.pc_next - s->pc_save); + } else if (CODE64(s)) { + tcg_gen_movi_tl(cpu_eip, s->base.pc_next); } else { - tcg_gen_movi_tl(cpu_eip, s->base.pc_next - s->cs_base); + tcg_gen_movi_tl(cpu_eip, (uint32_t)(s->base.pc_next - s->cs_base)); } s->pc_save = s->base.pc_next; } @@ -558,8 +560,10 @@ static void gen_update_eip_next(DisasContext *s) assert(s->pc_save != -1); if (TARGET_TB_PCREL) { tcg_gen_addi_tl(cpu_eip, cpu_eip, s->pc - s->pc_save); + } else if (CODE64(s)) { + tcg_gen_movi_tl(cpu_eip, s->base.pc_next); } else { - tcg_gen_movi_tl(cpu_eip, s->pc - s->cs_base); + tcg_gen_movi_tl(cpu_eip, (uint32_t)(s->base.pc_next - s->cs_base)); } s->pc_save = s->pc; } @@ -605,8 +609,10 @@ static TCGv eip_next_tl(DisasContext *s) TCGv ret = tcg_temp_new(); tcg_gen_addi_tl(ret, cpu_eip, s->pc - s->pc_save); return ret; + } else if (CODE64(s)) { + return tcg_constant_tl(s->pc); } else { - return tcg_constant_tl(s->pc - s->cs_base); + return tcg_constant_tl((uint32_t)(s->pc - s->cs_base)); } } @@ -617,8 +623,10 @@ static TCGv eip_cur_tl(DisasContext *s) TCGv ret = tcg_temp_new(); tcg_gen_addi_tl(ret, cpu_eip, s->base.pc_next - s->pc_save); return ret; + } else if (CODE64(s)) { + return tcg_constant_tl(s->base.pc_next); } else { - return tcg_constant_tl(s->base.pc_next - s->cs_base); + return tcg_constant_tl((uint32_t)(s->base.pc_next - s->cs_base)); } } @@ -2875,6 +2883,10 @@ static void gen_jmp_rel(DisasContext *s, MemOp ot, int diff, int tb_num) } } new_eip &= mask; + new_pc = new_eip + s->cs_base; + if (!CODE64(s)) { + new_pc = (uint32_t)new_pc; + } gen_update_cc_op(s); set_cc_op(s, CC_OP_DYNAMIC); @@ -2892,8 +2904,7 @@ static void gen_jmp_rel(DisasContext *s, MemOp ot, int diff, int tb_num) } } - if (use_goto_tb && - translator_use_goto_tb(&s->base, new_eip + s->cs_base)) { + if (use_goto_tb && translator_use_goto_tb(&s->base, new_pc)) { /* jump to same page: we can use a direct jump */ tcg_gen_goto_tb(tb_num); if (!TARGET_TB_PCREL) { From patchwork Tue Jan 23 08:48:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 765185 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:10c4:b0:337:62d3:c6d5 with SMTP id b4csp1499144wrx; Tue, 23 Jan 2024 00:49:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IHxwl6tRtUUgYooSKqTQDJaDdYqg/LsIJcLGchjbtskEZkY1vP1hOmhhV6g/sqV13ttXaVC X-Received: by 2002:a05:6214:c2a:b0:685:857c:64bd with SMTP id a10-20020a0562140c2a00b00685857c64bdmr490046qvd.69.1705999794364; Tue, 23 Jan 2024 00:49:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705999794; cv=none; d=google.com; s=arc-20160816; b=IDZIApDCc+49Z4EeycfRR2TzilIGAFBldlBbgxFQ8xPypss0YwkmdtmA+R9s599LFM Jj6p1GFFWiYXXO73ydU8cuvJxrxM6uo5m3JjJbBNrKjDj79GTjweGLwjCVQvf/8upg0n nlG7gfyW+KoAQ2CiCjwo2GOC8SV6WGTn1GlrzDekmdqIuRXvcAOVePon8NYWz87/qz1x zegQ7l9ZbEdZ3ZudBKhjJlDM8bMlcVQZ7/Z6lYqurh6B54BKCoXLWJ/d0LCzuH46FvRw un2MMQNj/fATvgkTGRRaNlW+qdREw653xsRQBg0ZVARaP3LP0QGePxz9UJhVZ5s29sI1 FSaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=3yyASiKHkTisTMEpyd8yuZZ1nAdJjQQKxsYJ1orjgQY=; fh=k5b5Oh4TsJsx1RRQS4r+y6BXFn6KjyetC2Ck18MVAw4=; b=kl8mdUU5d4H1ydurGRSE4pyJcspSThPcfrBuJQ/h0rmafQAhtdDV4YgijFEcZUOJFt deOtzc2kwly8gzZStz638WHiqGRHwAVG2mckb2BDPhWfSTPHjxgEEeCjZ4UBBi8qdSnJ +pOKzohVC26kWaLBh2hmbWIj2YbbMzErmOROVeLA7GWwn3zMOuoC7b0XnoJ0f4qQe/sr 2R84gxNU1WJd3sqiyF4D9KJCvj5r1JSjxPcUx+p+chK1ANRlRM5bBwF3LE10Oh3GNzlg P6iQFunPN++tcEOMbe6tH9kbwPS9vnjWtusogvJ1Ii1+FwRheGav7dDpC826fSFFA2ZL xhfg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q6-20020a0cf5c6000000b006854a852bc5si7276001qvm.556.2024.01.23.00.49.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jan 2024 00:49:54 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSCSY-0001LI-5y; Tue, 23 Jan 2024 03:48:42 -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 1rSCSW-0001L1-JQ; Tue, 23 Jan 2024 03:48:40 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rSCSU-0004to-Tv; Tue, 23 Jan 2024 03:48:40 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 90C8446670; Tue, 23 Jan 2024 11:49:11 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 54E0D699EE; Tue, 23 Jan 2024 11:48:31 +0300 (MSK) Received: (nullmailer pid 3828108 invoked by uid 1000); Tue, 23 Jan 2024 08:48:31 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Michael Tokarev , Paolo Bonzini Subject: [Stable-7.2.9 11/20] target/i386: Do not re-compute new pc with CF_PCREL Date: Tue, 23 Jan 2024 11:48:21 +0300 Message-Id: <20240123084831.3828060-3-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson With PCREL, we have a page-relative view of EIP, and an approximation of PC = EIP+CSBASE that is good enough to detect page crossings. If we try to recompute PC after masking EIP, we will mess up that approximation and write a corrupt value to EIP. We already handled masking properly for PCREL, so the fix in b5e0d5d2 was only needed for the !PCREL path. Cc: qemu-stable@nongnu.org Fixes: b5e0d5d22fbf ("target/i386: Fix 32-bit wrapping of pc/eip computation") Reported-by: Michael Tokarev Signed-off-by: Richard Henderson Message-ID: <20240101230617.129349-1-richard.henderson@linaro.org> Signed-off-by: Paolo Bonzini (cherry picked from commit a58506b748b8988a95f4fa1a2420ac5c17038b30) Signed-off-by: Michael Tokarev diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 15b030d84b..fa2e1dc3b3 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -2883,10 +2883,6 @@ static void gen_jmp_rel(DisasContext *s, MemOp ot, int diff, int tb_num) } } new_eip &= mask; - new_pc = new_eip + s->cs_base; - if (!CODE64(s)) { - new_pc = (uint32_t)new_pc; - } gen_update_cc_op(s); set_cc_op(s, CC_OP_DYNAMIC); @@ -2902,6 +2898,8 @@ static void gen_jmp_rel(DisasContext *s, MemOp ot, int diff, int tb_num) tcg_gen_andi_tl(cpu_eip, cpu_eip, mask); use_goto_tb = false; } + } else if (!CODE64(s)) { + new_pc = (uint32_t)(new_eip + s->cs_base); } if (use_goto_tb && translator_use_goto_tb(&s->base, new_pc)) {