From nobody Wed May 15 14:04:43 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=quarantine dis=none) header.from=mail.ustc.edu.cn ARC-Seal: i=1; a=rsa-sha256; t=1675871404; cv=none; d=zohomail.com; s=zohoarc; b=LZrQWlc8r8I5FEg/BNRfVzrLqRLNTIwfgYz4ZJwBuV/9u2uA8j2usrnd0eSiXVnd1ls6cvR3nytrEw4d91ZmPk0v5dk677ukFMElQDyjon1Co2kGT3go2W6smNE0wImxaiJCHtaz9cEGUKkWrKsz+SzwQEGfcSsxbP/f8fS+Kgk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675871404; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=F6Jfn8VELwxSxUXokZHadjeV2QQJfmlbc53zLAvxhv0=; b=EtDMPM5CBp/NxsvbiAy/FUrD/MkgtILwHOGn6Pjled0ouUzlPDmCwGotqlqBET54Y531ZcNHhnR1mFBlfRg7g1y1+AEYx4HpPofXC0kpqf3sct0p0NX9EG9WuZ2OybIW+mHCLvg60wJk6htM8LKoIxTqsY2lCJRhFA+nKUoMqGk= 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 16758714037891006.7605388563854; Wed, 8 Feb 2023 07:50:03 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPmhT-0002YV-Os; Wed, 08 Feb 2023 10:49:35 -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 1pPmhR-0002Y8-OF for qemu-devel@nongnu.org; Wed, 08 Feb 2023 10:49:33 -0500 Received: from email6.ustc.edu.cn ([2001:da8:d800::8] helo=ustc.edu.cn) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPmhN-0005ud-Cv for qemu-devel@nongnu.org; Wed, 08 Feb 2023 10:49:33 -0500 Received: by ajax-webmail-newmailweb.ustc.edu.cn (Coremail) ; Wed, 8 Feb 2023 23:49:12 +0800 (GMT+08:00) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.ustc.edu.cn; s=dkim; h=Received:Date:From:To:Cc:Subject: Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID; bh=F6Jfn8VELwxSxUXokZHadjeV2QQJfmlbc53zLAvxhv0=; b=PPjcTDRPWe7NT ZQKOCGHD69LCPowKxoUnZYCuuWo8eS20d/NgoWms3283ezb+xoAxko+DfWp0tUAz tFq7/VV7iiwJGuiWL3K7ZXvoWrEU+BWra+4hZzJzqKy+dVfchhq2obZkpnPimHIw ogZdLBH8Wo6hjZSt9lZMR0QMZJUl5Y= X-Originating-IP: [120.204.78.217] Date: Wed, 8 Feb 2023 23:49:12 +0800 (GMT+08:00) X-CM-HeaderCharset: UTF-8 From: fanwj@mail.ustc.edu.cn To: qemu-devel@nongnu.org Cc: laurent@vivier.eu, peter.maydell@linaro.org Subject: [PATCH] linux-user: fix bug about incorrect base addresss of gdt on i386 and x86_64 X-Priority: 3 X-Mailer: Coremail Webmail Server Version XT3.0.8 dev build 20210401(c5ff3689) Copyright (c) 2002-2023 www.mailtech.cn ustccn X-SendMailWithSms: false Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Message-ID: <4172b90.58b08.18631b77860.Coremail.fanwj@mail.ustc.edu.cn> X-Coremail-Locale: zh_CN X-CM-TRANSID: LkAmygD3+2t5xONj7C2DAQ--.1W X-CM-SenderInfo: pidq4yo6pdxzwoxv3uoohg3hdfq/1tbiAQ0QEFQhoQJdKAAAsv X-Coremail-Antispam: 1Ur529EdanIXcx71UUUUU7IcSsGvfJ3iIAIbVAYjsxI4VWxJw CS07vEb4IE77IF4wCS07vE1I0E4x80FVAKz4kxMIAIbVAFxVCaYxvI4VCIwcAKzIAtYxBI daVFxhVjvjDU= 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=2001:da8:d800::8; envelope-from=fanwj@mail.ustc.edu.cn; helo=ustc.edu.cn X-Spam_score_int: 13 X-Spam_score: 1.3 X-Spam_bar: + X-Spam_report: (1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_PBL=3.335, SPF_HELO_PASS=-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.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 @mail.ustc.edu.cn) X-ZM-MESSAGEID: 1675871405197100003 Content-Type: text/plain; charset="utf-8" On linux user mode, CPUX86State::gdt::base from Different CPUX86State Objec= ts have same value, It is incorrect! Every CPUX86State::gdt::base Must poin= ts to independent memory space.=20 Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1405 Signed-off-by: fanwenjie --- linux-user/i386/cpu_loop.c | 9 +++++++++ linux-user/main.c | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c index 865413c..48511cd 100644 --- a/linux-user/i386/cpu_loop.c +++ b/linux-user/i386/cpu_loop.c @@ -314,8 +314,17 @@ void cpu_loop(CPUX86State *env) } } =20 +static void target_cpu_free(void *obj) +{ + CPUArchState* env =3D ((CPUState*)obj)->env_ptr; + target_munmap(env->gdt.base, sizeof(uint64_t) * TARGET_GDT_ENTRIES); + g_free(obj); +} + void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) { + CPUState* cpu =3D env_cpu(env); + OBJECT(cpu)->free =3D target_cpu_free; env->cr[0] =3D CR0_PG_MASK | CR0_WP_MASK | CR0_PE_MASK; env->hflags |=3D HF_PE_MASK | HF_CPL_MASK; if (env->features[FEAT_1_EDX] & CPUID_SSE) { diff --git a/linux-user/main.c b/linux-user/main.c index a17fed0..3acd9b4 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -234,6 +234,13 @@ CPUArchState *cpu_copy(CPUArchState *env) =20 new_cpu->tcg_cflags =3D cpu->tcg_cflags; memcpy(new_env, env, sizeof(CPUArchState)); +#if defined(TARGET_I386) || defined(TARGET_X86_64) + new_env->gdt.base =3D target_mmap(0, sizeof(uint64_t) * TARGET_GDT_ENT= RIES, + PROT_READ|PROT_WRITE, + MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); + memcpy((void*)g2h_untagged(new_env->gdt.base), (void*)g2h_untagged(env= ->gdt.base), sizeof(uint64_t) * TARGET_GDT_ENTRIES); + OBJECT(new_cpu)->free =3D OBJECT(cpu)->free; +#endif =20 /* Clone all break/watchpoints. Note: Once we support ptrace with hw-debug register access, make su= re --=20 2.34.1