From nobody Sun Nov 24 20:37:09 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=1720955604; cv=none; d=zohomail.com; s=zohoarc; b=j8uQm5E7EHa4aXzVYnUtnOW5vu2n6VGl7H1JBi/EauPt3M64Z69g9+fODUsQoHr7PqUKy+hqrzx2oS6hQpW2CmgaBIFrSXWhtLU2fhgyF6fxQmA4om+GcLIZv0kkuu3jM7lL4c/uSbsYrQIFot/Ebz4iLc/KqpcNVgwKdAromLg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1720955604; 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=wED3eSbZqAQrLro/ysxQ2PfWVzr9a+Prs+exQ4GwPs0=; b=lUs/e86DPU8WX2vt41jEHCgTRXv9uRt+Y7HFhjN6i+Sx5lEuemc4hZZrAE6INkbOjeMriReH+fGqGDs64iAjDp3wv4d6mnMj5Df25iYPNG1MYBf//SObM+O2tI243OzyYs/zw3KwHU1OxLgD9h4s/umd9yu9dGUi3PZA9K1q/9I= 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 1720955604584408.4132117826489; Sun, 14 Jul 2024 04:13:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSx8Z-00065Y-6L; Sun, 14 Jul 2024 07:11:27 -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 1sSx8X-0005xc-2R for qemu-devel@nongnu.org; Sun, 14 Jul 2024 07:11:25 -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 1sSx8U-00029L-9l for qemu-devel@nongnu.org; Sun, 14 Jul 2024 07:11:23 -0400 Received: from mail-lj1-f199.google.com (mail-lj1-f199.google.com [209.85.208.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-25-c1_8cBL-OzOtsX_K3V6geg-1; Sun, 14 Jul 2024 07:11:19 -0400 Received: by mail-lj1-f199.google.com with SMTP id 38308e7fff4ca-2ee8e904f01so39113571fa.1 for ; Sun, 14 Jul 2024 04:11:18 -0700 (PDT) Received: from avogadro.local ([151.95.101.29]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427a63449fcsm47002785e9.29.2024.07.14.04.11.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jul 2024 04:11:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720955481; 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=wED3eSbZqAQrLro/ysxQ2PfWVzr9a+Prs+exQ4GwPs0=; b=WrMBdZtSVsYVsVjDLX18MnRQPD0tAEfTgIko7UB0WArfELJajHJfXcEkyNHZIqaDH2syRT e+Ybqp1uRKtbY0Q7EIxohacLTZwBPO9aXmn3EP/qRrlNb+PCMvi6V+dntQPAMpMeL/UeSZ uEowJlHNC1QbjewMkWlMgd5b6YtWXJc= X-MC-Unique: c1_8cBL-OzOtsX_K3V6geg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720955476; x=1721560276; 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=wED3eSbZqAQrLro/ysxQ2PfWVzr9a+Prs+exQ4GwPs0=; b=GTyoXLEPn7W2pgQUKTwWvCS46XFuBDwsI5kmCFmNIQj1QmG2D56kE/a/KP/xJ179ZJ QSyTKz1XZ4DRbEV+1XOUzXKk3V8Gylzfa9IMf3Q34JGENVn8dDyhuYeXGy5XqIp6FLUB 35bY4eCPk4r8jLi9ZXhZXwC+t7TUyzsWMY1OewaJ14MTeFs51w5yXswsP2uZsEmnVwIj /jCs5K7wSJowbo2PqKy3HYBxVlTPk4O9/ZjGiHGidC/oy2m2IOxOaieo/7VsFcbsbgL4 57GYbu66BNiuw5gLmZX7g2yb12QajtRMPo81KRRQzQrhCd3NONlW7PUCPtlM7B9Jfk++ g6jg== X-Gm-Message-State: AOJu0Yzc3X5r8DpL9/4PGKqmMdSiqIY0Z3MEYFeSgJp1/SqcNrMxVZyJ N0+HRbakwUprUMLNJ8z08YK0n+HLPw128WYAHO+yFZhkOLJaZLFydg0gLSMOCCMW6ynZZI1j4yi Nb+zJLv+Lpxyy3AzxfKN1HxhsonRRddVYE2Fgwvzeoiv0mDTlDCx8AdePmCYWqexr3LfeOLoKFs Q4HzG3L3eeN+V8d87/ScF89Ko3f6hfhr8iltp+ X-Received: by 2002:a2e:860b:0:b0:2ee:d5e1:25e3 with SMTP id 38308e7fff4ca-2eed5e12629mr43681281fa.2.1720955476608; Sun, 14 Jul 2024 04:11:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+avKR/e80q37Kbr2Qi2vteaiNQouR+PnjJURdfwEF0fQDvn8xGsUghOGtX7ZuOXGYqi49OA== X-Received: by 2002:a2e:860b:0:b0:2ee:d5e1:25e3 with SMTP id 38308e7fff4ca-2eed5e12629mr43680941fa.2.1720955475218; Sun, 14 Jul 2024 04:11:15 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson Subject: [PULL 11/13] target/i386/tcg: save current task state before loading new one Date: Sun, 14 Jul 2024 13:10:41 +0200 Message-ID: <20240714111043.14132-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240714111043.14132-1-pbonzini@redhat.com> References: <20240714111043.14132-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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.01, RCVD_IN_MSPIKE_WL=-0.01, 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: 1720955605505116600 Content-Type: text/plain; charset="utf-8" This is how the steps are ordered in the manual. EFLAGS.NT is overwritten after the fact in the saved image. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- target/i386/tcg/seg_helper.c | 85 +++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index fea08a2ba0f..c0641a79c70 100644 --- a/target/i386/tcg/seg_helper.c +++ b/target/i386/tcg/seg_helper.c @@ -389,6 +389,42 @@ static int switch_tss_ra(CPUX86State *env, int tss_sel= ector, access_prepare_mmu(&new, env, tss_base, tss_limit, MMU_DATA_LOAD, mmu_index, retaddr); =20 + /* save the current state in the old TSS */ + old_eflags =3D cpu_compute_eflags(env); + if (old_type & 8) { + /* 32 bit */ + access_stl(&old, env->tr.base + 0x20, next_eip); + access_stl(&old, env->tr.base + 0x24, old_eflags); + access_stl(&old, env->tr.base + (0x28 + 0 * 4), env->regs[R_EAX]); + access_stl(&old, env->tr.base + (0x28 + 1 * 4), env->regs[R_ECX]); + access_stl(&old, env->tr.base + (0x28 + 2 * 4), env->regs[R_EDX]); + access_stl(&old, env->tr.base + (0x28 + 3 * 4), env->regs[R_EBX]); + access_stl(&old, env->tr.base + (0x28 + 4 * 4), env->regs[R_ESP]); + access_stl(&old, env->tr.base + (0x28 + 5 * 4), env->regs[R_EBP]); + access_stl(&old, env->tr.base + (0x28 + 6 * 4), env->regs[R_ESI]); + access_stl(&old, env->tr.base + (0x28 + 7 * 4), env->regs[R_EDI]); + for (i =3D 0; i < 6; i++) { + access_stw(&old, env->tr.base + (0x48 + i * 4), + env->segs[i].selector); + } + } else { + /* 16 bit */ + access_stw(&old, env->tr.base + 0x0e, next_eip); + access_stw(&old, env->tr.base + 0x10, old_eflags); + access_stw(&old, env->tr.base + (0x12 + 0 * 2), env->regs[R_EAX]); + access_stw(&old, env->tr.base + (0x12 + 1 * 2), env->regs[R_ECX]); + access_stw(&old, env->tr.base + (0x12 + 2 * 2), env->regs[R_EDX]); + access_stw(&old, env->tr.base + (0x12 + 3 * 2), env->regs[R_EBX]); + access_stw(&old, env->tr.base + (0x12 + 4 * 2), env->regs[R_ESP]); + access_stw(&old, env->tr.base + (0x12 + 5 * 2), env->regs[R_EBP]); + access_stw(&old, env->tr.base + (0x12 + 6 * 2), env->regs[R_ESI]); + access_stw(&old, env->tr.base + (0x12 + 7 * 2), env->regs[R_EDI]); + for (i =3D 0; i < 4; i++) { + access_stw(&old, env->tr.base + (0x22 + i * 2), + env->segs[i].selector); + } + } + /* read all the registers from the new TSS */ if (type & 8) { /* 32 bit */ @@ -428,49 +464,16 @@ static int switch_tss_ra(CPUX86State *env, int tss_se= lector, if (source =3D=3D SWITCH_TSS_JMP || source =3D=3D SWITCH_TSS_IRET) { tss_set_busy(env, env->tr.selector, 0, retaddr); } - old_eflags =3D cpu_compute_eflags(env); + if (source =3D=3D SWITCH_TSS_IRET) { old_eflags &=3D ~NT_MASK; + if (old_type & 8) { + access_stl(&old, env->tr.base + 0x24, old_eflags); + } else { + access_stw(&old, env->tr.base + 0x10, old_eflags); + } } =20 - /* save the current state in the old TSS */ - if (old_type & 8) { - /* 32 bit */ - access_stl(&old, env->tr.base + 0x20, next_eip); - access_stl(&old, env->tr.base + 0x24, old_eflags); - access_stl(&old, env->tr.base + (0x28 + 0 * 4), env->regs[R_EAX]); - access_stl(&old, env->tr.base + (0x28 + 1 * 4), env->regs[R_ECX]); - access_stl(&old, env->tr.base + (0x28 + 2 * 4), env->regs[R_EDX]); - access_stl(&old, env->tr.base + (0x28 + 3 * 4), env->regs[R_EBX]); - access_stl(&old, env->tr.base + (0x28 + 4 * 4), env->regs[R_ESP]); - access_stl(&old, env->tr.base + (0x28 + 5 * 4), env->regs[R_EBP]); - access_stl(&old, env->tr.base + (0x28 + 6 * 4), env->regs[R_ESI]); - access_stl(&old, env->tr.base + (0x28 + 7 * 4), env->regs[R_EDI]); - for (i =3D 0; i < 6; i++) { - access_stw(&old, env->tr.base + (0x48 + i * 4), - env->segs[i].selector); - } - } else { - /* 16 bit */ - access_stw(&old, env->tr.base + 0x0e, next_eip); - access_stw(&old, env->tr.base + 0x10, old_eflags); - access_stw(&old, env->tr.base + (0x12 + 0 * 2), env->regs[R_EAX]); - access_stw(&old, env->tr.base + (0x12 + 1 * 2), env->regs[R_ECX]); - access_stw(&old, env->tr.base + (0x12 + 2 * 2), env->regs[R_EDX]); - access_stw(&old, env->tr.base + (0x12 + 3 * 2), env->regs[R_EBX]); - access_stw(&old, env->tr.base + (0x12 + 4 * 2), env->regs[R_ESP]); - access_stw(&old, env->tr.base + (0x12 + 5 * 2), env->regs[R_EBP]); - access_stw(&old, env->tr.base + (0x12 + 6 * 2), env->regs[R_ESI]); - access_stw(&old, env->tr.base + (0x12 + 7 * 2), env->regs[R_EDI]); - for (i =3D 0; i < 4; i++) { - access_stw(&old, env->tr.base + (0x22 + i * 2), - env->segs[i].selector); - } - } - - /* now if an exception occurs, it will occurs in the next task - context */ - if (source =3D=3D SWITCH_TSS_CALL) { /* * Thanks to the probe_access above, we know the first two @@ -486,7 +489,9 @@ static int switch_tss_ra(CPUX86State *env, int tss_sele= ctor, } =20 /* set the new CPU state */ - /* from this point, any exception which occurs can give problems */ + + /* now if an exception occurs, it will occur in the next task context = */ + env->cr[0] |=3D CR0_TS_MASK; env->hflags |=3D HF_TS_MASK; env->tr.selector =3D tss_selector; --=20 2.45.2