From nobody Thu May 2 18:35:53 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622730521; cv=none; d=zohomail.com; s=zohoarc; b=RPohrHoZpgdyGf1un3wi3ic1U0pV/rzkt0mexR3GElI93iiRxv3m6nnLPOYgBzwhTRdnYLbwIuhhk8mFsF48+9WSB8Z1/lemYRFiuhpP2sWgn0TMb0gnLlbFkVv/jUUCw0dyI2Om69pwWUJy3JJXV+Z2lTYdTRzY6xbHC0puwxw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622730521; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GjSj1BvMv7SkGTnFgml+cFr3Qod8iyQlPdCz9aegSrI=; b=gz8jM50mF75MhDokQLTTJM8h33t63N6Yck34ukE8Cbmm/4B5nB8eEZZSbq7+bX6Z7aRl1SILYpz3yo9BMUfu8G3Lh30+oGzmKTF9Qg/phVlRbwoikuTVB1jvsg6v3kNn3n3qytWDVwh5DpAeG+seY7RHQJ1j0KVDLNF3+AFuYlg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16227305217641019.6084619120644; Thu, 3 Jun 2021 07:28:41 -0700 (PDT) Received: from localhost ([::1]:57272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1looKu-0008Rs-Oi for importer2@patchew.org; Thu, 03 Jun 2021 10:28:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35670) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1looJc-0005gj-Tv for qemu-devel@nongnu.org; Thu, 03 Jun 2021 10:27:20 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]:43651) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1looJa-0000Hj-H8 for qemu-devel@nongnu.org; Thu, 03 Jun 2021 10:27:20 -0400 Received: by mail-ed1-x52b.google.com with SMTP id s6so7339686edu.10 for ; Thu, 03 Jun 2021 07:27:18 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id p13sm1562747ejr.87.2021.06.03.07.27.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 07:27:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GjSj1BvMv7SkGTnFgml+cFr3Qod8iyQlPdCz9aegSrI=; b=PYghqe/RQS/a9pXknY1ax2g75KzsW9oQX8bR2qtkT38J8YkaOEPjjhy6L5CGaNzrX0 rIos8pI0AMaRGRcw402HFFkzgRBzntmbw7a3QG3oZwOGdx5QJ+8qaOS/ju4KAULSP+s4 8iGhlQjLEBZWzZINdONls3E5iTxLaldJtHAGdZiTzIyPLgWnLpu0m13pXZCIEMNqMknV Z9zvR7oqVHGMWM6Pg7JNkhdiAbx7cSEntTAX/4iMMjrWsbCtHbQbHkTIi0ei7YoNv5ZL Iw3Jl4yqOs/p/VpQ4bzkQEYdSzBfAzmRPSkjllTYFmOFqL2R1fUrVFJxLPWSIXfi78Y2 lTpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GjSj1BvMv7SkGTnFgml+cFr3Qod8iyQlPdCz9aegSrI=; b=VNtNN0RfWOfTFsKAWk/dVPZWMMj1h+OwdBmJc7Y9jobM5sSfIiye5adseIqemd4Kxt AIjuDJImzKs8ZcTD7vYFN6/MqXv8WcHhvXCBEhM6A82zi8/l7gk+Llyq+ehhRwEKf6rT P12ml17byIoPI2rd/5c17zKikrPql9RMX9Wc47gYMS8lLshV7ymbE5oI1WTnYksOQgJu nIUc0VKow4poxaI+4Y3ZE7+KYCfXzB+3oNkUlznvkdckfHMEVnNjw+l7Si6d6dYeosya TuLIyPV2AHu1u9Dlob3aG0FdAkxuqNNTx9Vd6emSvClc8XBvcjua5bXKXaVECMzuQrCg scUQ== X-Gm-Message-State: AOAM531zVbFjQ974ncvCh/ORkdn5bW/0jll0scAjI65KgeRGhX+xqRWn 1nfhnzb8dzzUC+9rAb6Gq7RUwaVzIo2+tQ== X-Google-Smtp-Source: ABdhPJxx97wahZAFSzrLSFx+YB5jneBidNkgV2sV+3ajw6AYp9khJntgvw4gb6zCTLPcZHmMSBg2qA== X-Received: by 2002:a05:6402:1801:: with SMTP id g1mr43474edy.305.1622730437247; Thu, 03 Jun 2021 07:27:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/3] target/i386: tcg: fix segment register offsets for 16-bit TSS Date: Thu, 3 Jun 2021 16:27:12 +0200 Message-Id: <20210603142714.224210-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210603142714.224210-1-pbonzini@redhat.com> References: <20210603142714.224210-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52b.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The TSS offsets in the manuals have only 2-byte slots for the segment registers. QEMU incorrectly uses 4-byte slots, so that SS overlaps the LDT selector. Resolves: #382 Reported-by: Peter Maydell Signed-off-by: Paolo Bonzini Reviewed-by: Peter Maydell --- target/i386/tcg/seg_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index 2f6cdc8239..547b959689 100644 --- a/target/i386/tcg/seg_helper.c +++ b/target/i386/tcg/seg_helper.c @@ -281,7 +281,7 @@ static void switch_tss_ra(CPUX86State *env, int tss_sel= ector, retaddr) | 0xffff0000; } for (i =3D 0; i < 4; i++) { - new_segs[i] =3D cpu_lduw_kernel_ra(env, tss_base + (0x22 + i *= 4), + new_segs[i] =3D cpu_lduw_kernel_ra(env, tss_base + (0x22 + i *= 2), retaddr); } new_ldt =3D cpu_lduw_kernel_ra(env, tss_base + 0x2a, retaddr); @@ -349,7 +349,7 @@ static void switch_tss_ra(CPUX86State *env, int tss_sel= ector, cpu_stw_kernel_ra(env, env->tr.base + (0x12 + 6 * 2), env->regs[R_= ESI], retaddr); cpu_stw_kernel_ra(env, env->tr.base + (0x12 + 7 * 2), env->regs[R_= EDI], retaddr); for (i =3D 0; i < 4; i++) { - cpu_stw_kernel_ra(env, env->tr.base + (0x22 + i * 4), + cpu_stw_kernel_ra(env, env->tr.base + (0x22 + i * 2), env->segs[i].selector, retaddr); } } --=20 2.31.1 From nobody Thu May 2 18:35:53 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622730799; cv=none; d=zohomail.com; s=zohoarc; b=my94/2z194X+TtPeqUX6NwlYjBmCI15dT8niHt2i4/28y6acEy4aKbD9WaT6RXMB0d0mL9zmK36GbIFk0kLZJu6M/PonJSMMBNNWmtrrz77UnGvB5IaV0X1rFCGlYr4CUh7ojqVC0QhFAnMAdu4zkX/N9hnSU5uNjCsPe+VFOd4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622730799; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cMD/MQJK6RuY6kQefUquuNuGpcrRXIPINqzY23mVatU=; b=QysgDpUqnXKNZVP/8D+xZy6Opr270l5+SnB+o0QD3Mrtff+OF6Gd6OkvOmjatuoQQPQGt0wqOlOK6rxvXNWMO3DkS18QCh8FCV/Ky4hflK6QmxkDmFLyEcLDqk8t0AUAgxwObTv1txkMkaRQm1doL5zjEy2TeQKUvKHKAB7h2Bw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1622730799068705.7956548311362; Thu, 3 Jun 2021 07:33:19 -0700 (PDT) Received: from localhost ([::1]:42414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1looPO-0000zK-3Z for importer2@patchew.org; Thu, 03 Jun 2021 10:33:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1looJd-0005h7-2C for qemu-devel@nongnu.org; Thu, 03 Jun 2021 10:27:21 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]:40875) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1looJb-0000IT-7d for qemu-devel@nongnu.org; Thu, 03 Jun 2021 10:27:20 -0400 Received: by mail-ed1-x532.google.com with SMTP id t3so7345894edc.7 for ; Thu, 03 Jun 2021 07:27:18 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id p13sm1562747ejr.87.2021.06.03.07.27.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 07:27:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cMD/MQJK6RuY6kQefUquuNuGpcrRXIPINqzY23mVatU=; b=pbZuXFr7Br2cSmjYWWLCXuPupneXHm2z+UnvP4BH5AwJ2+Tuukz4+uXxVDUvTDdkYX hTV+gmZU+bKcUz3jlbweMZqEucEVi1JdDfpw8M6F33HXAEzUpW8jcuOZE8oVjAm1jJ7P xn/JUeFuKkxlyJvxkAVrdF4hXyHR/qT1E7b2260Q3CcUrJwUN+1LXA7fTTKaz+WHrWDv 6H+mq6j1/rg7BowON/vnZVlkawfLS/eY5RNU/IX9mjpXydBvDBw8LbSb3FBBDbgCIi+W 1Ouapxjr9jqA4NCiyCRw2OK81OMsDAP5tnI5k8V2IGDu1cRedOZI+flY149KEV57JnAb dCFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cMD/MQJK6RuY6kQefUquuNuGpcrRXIPINqzY23mVatU=; b=Ksx7KoJfn3q9mT4DSB5lz1Yy2EjSjNqpmqWMJzYckWRPgqwHSvR+O6sdIQzT/wWmUc EMgEgIo6tUDRf4bcBb435C+vH2IwrcjNMZBkksAUyQVRNC2NgALPQlee2D1OYDePeQn9 h/scNb/1t19BPXqOpuXQtzETwf0KbCnwhTpnXONZCNLA9QtE3rCGIR1a12ACtyufxE02 g+9MqYzmqz8ZhqA22do1Dem8+pksUJEAn1Ozn3MpK4mEfeTK6SqppLE7B4iAQCkkX8IS YE7Mpou3OhxdFblqIzei/2aavEt4NyBiywo84P4dMOVgVyqoIn2jVgo5XGDZF+0bb9hD RZ/Q== X-Gm-Message-State: AOAM531dHki5SFOwVCprtkmeCRE8yjRuv/8n0SCaYws7MCav35qVUun5 QcfJ/cAmJcl4n9lTRmdyWKxEhsVhmeuxiw== X-Google-Smtp-Source: ABdhPJxX19lyHmgqx0nfueYsSSdCGmlpg99Sea1JIlrm2yM1h26yjw1XynMX+hUmXFF34HNoqIP69A== X-Received: by 2002:a05:6402:4c5:: with SMTP id n5mr90195edw.322.1622730437923; Thu, 03 Jun 2021 07:27:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/3] target/i386: tcg: fix loading of registers from 16-bit TSS Date: Thu, 3 Jun 2021 16:27:13 +0200 Message-Id: <20210603142714.224210-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210603142714.224210-1-pbonzini@redhat.com> References: <20210603142714.224210-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x532.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" According to the manual, the high 16-bit of the registers are preserved when switching to a 16-bit task. Implement this in switch_tss_ra. Signed-off-by: Paolo Bonzini --- target/i386/tcg/seg_helper.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index 547b959689..2112c5fc51 100644 --- a/target/i386/tcg/seg_helper.c +++ b/target/i386/tcg/seg_helper.c @@ -277,8 +277,7 @@ static void switch_tss_ra(CPUX86State *env, int tss_sel= ector, new_eip =3D cpu_lduw_kernel_ra(env, tss_base + 0x0e, retaddr); new_eflags =3D cpu_lduw_kernel_ra(env, tss_base + 0x10, retaddr); for (i =3D 0; i < 8; i++) { - new_regs[i] =3D cpu_lduw_kernel_ra(env, tss_base + (0x12 + i *= 2), - retaddr) | 0xffff0000; + new_regs[i] =3D cpu_lduw_kernel_ra(env, tss_base + (0x12 + i *= 2), retaddr); } for (i =3D 0; i < 4; i++) { new_segs[i] =3D cpu_lduw_kernel_ra(env, tss_base + (0x22 + i *= 2), @@ -391,19 +390,17 @@ static void switch_tss_ra(CPUX86State *env, int tss_s= elector, env->eip =3D new_eip; eflags_mask =3D TF_MASK | AC_MASK | ID_MASK | IF_MASK | IOPL_MASK | VM_MASK | RF_MASK | NT_MASK; - if (!(type & 8)) { - eflags_mask &=3D 0xffff; + if (type & 8) { + cpu_load_eflags(env, new_eflags, eflags_mask); + for (i =3D 0; i < 8; i++) { + env->regs[i] =3D new_regs[i]; + } + } else { + cpu_load_eflags(env, new_eflags, eflags_mask & 0xffff); + for (i =3D 0; i < 8; i++) { + env->regs[i] =3D (env->regs[i] & 0xffff0000) | new_regs[i]; + } } - cpu_load_eflags(env, new_eflags, eflags_mask); - /* XXX: what to do in 16 bit case? */ - env->regs[R_EAX] =3D new_regs[0]; - env->regs[R_ECX] =3D new_regs[1]; - env->regs[R_EDX] =3D new_regs[2]; - env->regs[R_EBX] =3D new_regs[3]; - env->regs[R_ESP] =3D new_regs[4]; - env->regs[R_EBP] =3D new_regs[5]; - env->regs[R_ESI] =3D new_regs[6]; - env->regs[R_EDI] =3D new_regs[7]; if (new_eflags & VM_MASK) { for (i =3D 0; i < 6; i++) { load_seg_vm(env, i, new_segs[i]); --=20 2.31.1 From nobody Thu May 2 18:35:53 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622730786; cv=none; d=zohomail.com; s=zohoarc; b=TyQyc/SlzVuA1cSPZyCyUqi/fH6Itu8OTi3sIGDFJPUPGnWA8rTnpKqyl/4rNPC0/cSF6C3+nFHjYwtiCLfmHgI0sQ1mBbljyRqFfUhAmbBMEbIwPrUm61YHo+73cqEHL6dYxU1h+2QoEo2FKH58xb2YnK/FjOGOUT4Pm+B2XpE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622730786; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eiNYKdEymzNvK37Wm5/uHgaRQxlBgWOvTJMeH6EfWJI=; b=Z/xJu37qmXXJsm+5hlh+4a9W4c8cikzuf1m/eqgSmZaGfA18HKbxFXJ9QPLeXtiO/BTtnqnpZPmocTq2OlVb3OfyDBN/kQtJAq8SuPVedueLC6bCqxATCxCcS3xMe+rbUVDM9nTt5mQysAZJdzhTBBbhzky5uUjPOH4LrrHFroY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1622730786503744.8853134707257; Thu, 3 Jun 2021 07:33:06 -0700 (PDT) Received: from localhost ([::1]:41540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1looPA-0000Mf-K3 for importer2@patchew.org; Thu, 03 Jun 2021 10:33:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1looJd-0005ie-E1 for qemu-devel@nongnu.org; Thu, 03 Jun 2021 10:27:21 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:38598) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1looJb-0000J5-Rk for qemu-devel@nongnu.org; Thu, 03 Jun 2021 10:27:21 -0400 Received: by mail-ej1-x629.google.com with SMTP id og14so4230708ejc.5 for ; Thu, 03 Jun 2021 07:27:19 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id p13sm1562747ejr.87.2021.06.03.07.27.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 07:27:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eiNYKdEymzNvK37Wm5/uHgaRQxlBgWOvTJMeH6EfWJI=; b=pXv9TyuhdBwI4/dhVffFBp8GzmauTf896baQ9e71K7sEsoo3K6DLbD8apTcOgYsmya XxgV3qdQ0aStrqfRIotbwmek6jnyGJHRD1hifFkwaSRT0wxmOSr/iJsgE7yvKFJAsgZX lb2Bwi1VBrqwvzlW3n+zWxVhaRe3admwBREGoS/gbntf2djtc9poJwZPSACsoXcffMyO 4gjp8opQ/L4OFKD/+AK8EYhiX4gcVKYn8gEzYjq+qMPq0Ki3qHq6YtpsjmptXT0AZRX2 WQcyyJHSp2G6wcUYQnGNV+yMSGwhI69Ahws0quwR05TisPzaalvBEpyMGTXAY7bz5YYN ArtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eiNYKdEymzNvK37Wm5/uHgaRQxlBgWOvTJMeH6EfWJI=; b=OovpeIq+AafrHLTLMTaCh+MnS/NcCaMgGDYw6g0n1++eoBA8k94PSxwRik0wJQWNRK rS5ALr3BvKEt5GPiiYeF+imbjd1/xbhM7tUui6YvfLOpgHP6DgQBTdMq5xGJvvc2tFWy UIF86DaqAOnpgVEOspJpDbcRdosjdkdrZI+QUHHBG24r/twrjgWHPC/ERdv8XKCMxeCL Mu5AfiNrwdlaIkJYIwrH4/ubynl4CmC4PnF8XQ+18gMUxnymBDv39DI7hqJ1YyW4CpKd ZDuA2Gjg4sZY1xqfDAFft/pL2lEAwAxgzEe1xgPp3chmAVyiAeNrkWsw6LrUnl0AMudO Ub9w== X-Gm-Message-State: AOAM531L5B01M8Pt32zoDk6a9KvHTPg1B4Gw2FArD7OmKqhOO3TuUtfy 9Vrv/ZL2IYoe9KxIbAndL+EIfirtpiSpKA== X-Google-Smtp-Source: ABdhPJyklr70PpOmSHAo2yJ6lPy0AvlXFQJWl91Ct/7TgpPdqgvNjLLtCNzhubNnBNjNo57YWmtXzA== X-Received: by 2002:a17:906:2612:: with SMTP id h18mr22979668ejc.417.1622730438622; Thu, 03 Jun 2021 07:27:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/3] target/i386: tcg: fix switching from 16-bit to 32-bit tasks or vice versa Date: Thu, 3 Jun 2021 16:27:14 +0200 Message-Id: <20210603142714.224210-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210603142714.224210-1-pbonzini@redhat.com> References: <20210603142714.224210-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x629.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The format of the task state segment is governed by bit 3 in the descriptor type field. On a task switch, the format for saving is given by the current value of TR's type field, while the format for loading is given by the new descriptor. Signed-off-by: Paolo Bonzini --- target/i386/tcg/seg_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index 2112c5fc51..3ed20ca31d 100644 --- a/target/i386/tcg/seg_helper.c +++ b/target/i386/tcg/seg_helper.c @@ -319,7 +319,7 @@ static void switch_tss_ra(CPUX86State *env, int tss_sel= ector, } =20 /* save the current state in the old TSS */ - if (type & 8) { + if (old_type & 8) { /* 32 bit */ cpu_stl_kernel_ra(env, env->tr.base + 0x20, next_eip, retaddr); cpu_stl_kernel_ra(env, env->tr.base + 0x24, old_eflags, retaddr); --=20 2.31.1