From nobody Thu Sep 19 00:18: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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1721192828; cv=none; d=zohomail.com; s=zohoarc; b=cIUE9QE3A7xz5m5+S8DlKDWUvvNUsuI96cckbKVdzRCAdz7WkTZGPZcZJVjetQOldiQYLC0VI7GbV0td/7ACoAI9HtTEsRW8laBYLsoPdUeEnIZeyXsMvl8PueY7n/CteigSaipkgkNVPVuZve+15lzXJ0ZsDcd7LKUMu6KVG14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1721192828; 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=TSrKWshh3GKRJaKaC48z20K8ZcvddsFT5215e+ccso8=; b=b29YKkzKWAyYb2CWgTc+/gSCbrBxH21iW3gcSvUAPF6GpOINmQTE/eOB/C/d6NCz+cNSluvGjU4ZNX7dgk2T4EfAViyAggshhrGb5PUJlzc2vKHawYt3IBlqDvRUP8G4TVxkAV3BkmcoT0xEoa7CY5eOn3EY4B/2NSoXENKheow= 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 172119282807531.6981241492648; Tue, 16 Jul 2024 22:07:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sTwq8-0002r8-Kh; Wed, 17 Jul 2024 01:04:32 -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 1sTwq0-0002J5-Oc for qemu-devel@nongnu.org; Wed, 17 Jul 2024 01:04: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 1sTwpv-00023C-J9 for qemu-devel@nongnu.org; Wed, 17 Jul 2024 01:04:24 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-149-dMYvJ4pUMfiuY6aw5b-rRA-1; Wed, 17 Jul 2024 01:04:15 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-42794cb8251so41227845e9.2 for ; Tue, 16 Jul 2024 22:04:15 -0700 (PDT) Received: from avogadro.local ([151.95.101.29]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427a5ef57aesm151574385e9.45.2024.07.16.22.04.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jul 2024 22:04:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721192659; 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=TSrKWshh3GKRJaKaC48z20K8ZcvddsFT5215e+ccso8=; b=UpjD553Tea1xkMrBz+2AKoGUXf6xhY3BMKyAq65V/+0fowVRzFx0waqoY1KTFLfNx6/89R K2EJSrOYJnMiMLyUp39V2Pv75KQhcF02v235dRJQTxDrc6MvzAsDtf1tBjjiUj5+lVuCeA a1JHjOEjIHZQJsHwomGma+/unRCU+MQ= X-MC-Unique: dMYvJ4pUMfiuY6aw5b-rRA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721192653; x=1721797453; 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=TSrKWshh3GKRJaKaC48z20K8ZcvddsFT5215e+ccso8=; b=Y6HTqkSRCP5oT51P6vUxjYUZNKHeuksj31qO6AxK7A9An/QTxu/0tY43ewHIimCfSR b8XXXeXlgv8vg9okOYCwSOgJ66BoCgqxu11lcLiirRiQSsU9jfM4h9fbNdR/QdATsUr9 jR8pKI+iZVjqcxSe/jlRwnvmLUh1sJ9zae5joqihKTeukFI+2KvcBQnuY/WmY2uLgM9i uMXQahsJBBTCPepnExfWPoZtO23XIbmvlupCkAxP3eWW6qMAc8rwQKIL7zz1Nu/qyPUz 288WT4/DtCos58LqDZ3BR41noAdpdF3TVchepUlKia7zw+gi95sZrvcXx+S5mv1uWP0c IAow== X-Gm-Message-State: AOJu0Yz0AUyawGHE6E+3VAMN8PglhZm6yayurpugWoLHSCzHMF9EqZFJ 5PWVl9i1DSVTtcsc9devfIC3s4xPRER3XB3/Gwnr575V+zq7D136VQ14DrBaNwX2EHhJbgze/Dt C1XBRiEHAaCldB3NspdoFqEHO5zYeGauKwJvFa1nLsraKZMo98XbY81Tn7hn26ggLtOtynE6FSB qT/chilYBeLfRCubUlf/pTHoVuAc/i6J60SItZ X-Received: by 2002:a05:600c:5494:b0:426:6087:198f with SMTP id 5b1f17b1804b1-427c2d05d3cmr2806475e9.39.1721192653161; Tue, 16 Jul 2024 22:04:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHsPdCkw9GE77lZWpf8EGhk4iuzWYJmu+VDg87AyO3UsySDfAkrohFyOX5Ur8CQWRaikUwmrg== X-Received: by 2002:a05:600c:5494:b0:426:6087:198f with SMTP id 5b1f17b1804b1-427c2d05d3cmr2806335e9.39.1721192652747; Tue, 16 Jul 2024 22:04:12 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson Subject: [PULL 17/20] target/i386/tcg: Compute MMU index once Date: Wed, 17 Jul 2024 07:03:27 +0200 Message-ID: <20240717050331.295371-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240717050331.295371-1-pbonzini@redhat.com> References: <20240717050331.295371-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, 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: 1721192828311116600 Content-Type: text/plain; charset="utf-8" Add the MMU index to the StackAccess struct, so that it can be cached or (in the next patch) computed from information that is not in CPUX86State. Co-developed-by: Richard Henderson Signed-off-by: Richard Henderson Signed-off-by: Paolo Bonzini --- target/i386/tcg/seg_helper.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index b6902ca3fba..8a6d92b3583 100644 --- a/target/i386/tcg/seg_helper.c +++ b/target/i386/tcg/seg_helper.c @@ -56,36 +56,37 @@ typedef struct StackAccess target_ulong ss_base; target_ulong sp; target_ulong sp_mask; + int mmu_index; } StackAccess; =20 static void pushw(StackAccess *sa, uint16_t val) { sa->sp -=3D 2; - cpu_stw_kernel_ra(sa->env, sa->ss_base + (sa->sp & sa->sp_mask), - val, sa->ra); + cpu_stw_mmuidx_ra(sa->env, sa->ss_base + (sa->sp & sa->sp_mask), + val, sa->mmu_index, sa->ra); } =20 static void pushl(StackAccess *sa, uint32_t val) { sa->sp -=3D 4; - cpu_stl_kernel_ra(sa->env, sa->ss_base + (sa->sp & sa->sp_mask), - val, sa->ra); + cpu_stl_mmuidx_ra(sa->env, sa->ss_base + (sa->sp & sa->sp_mask), + val, sa->mmu_index, sa->ra); } =20 static uint16_t popw(StackAccess *sa) { - uint16_t ret =3D cpu_lduw_data_ra(sa->env, - sa->ss_base + (sa->sp & sa->sp_mask), - sa->ra); + uint16_t ret =3D cpu_lduw_mmuidx_ra(sa->env, + sa->ss_base + (sa->sp & sa->sp_mask), + sa->mmu_index, sa->ra); sa->sp +=3D 2; return ret; } =20 static uint32_t popl(StackAccess *sa) { - uint32_t ret =3D cpu_ldl_data_ra(sa->env, - sa->ss_base + (sa->sp & sa->sp_mask), - sa->ra); + uint32_t ret =3D cpu_ldl_mmuidx_ra(sa->env, + sa->ss_base + (sa->sp & sa->sp_mask), + sa->mmu_index, sa->ra); sa->sp +=3D 4; return ret; } @@ -677,6 +678,7 @@ static void do_interrupt_protected(CPUX86State *env, in= t intno, int is_int, =20 sa.env =3D env; sa.ra =3D 0; + sa.mmu_index =3D cpu_mmu_index_kernel(env); =20 if (type =3D=3D 5) { /* task gate */ @@ -858,12 +860,12 @@ static void do_interrupt_protected(CPUX86State *env, = int intno, int is_int, static void pushq(StackAccess *sa, uint64_t val) { sa->sp -=3D 8; - cpu_stq_kernel_ra(sa->env, sa->sp, val, sa->ra); + cpu_stq_mmuidx_ra(sa->env, sa->sp, val, sa->mmu_index, sa->ra); } =20 static uint64_t popq(StackAccess *sa) { - uint64_t ret =3D cpu_ldq_data_ra(sa->env, sa->sp, sa->ra); + uint64_t ret =3D cpu_ldq_mmuidx_ra(sa->env, sa->sp, sa->mmu_index, sa-= >ra); sa->sp +=3D 8; return ret; } @@ -982,6 +984,7 @@ static void do_interrupt64(CPUX86State *env, int intno,= int is_int, =20 sa.env =3D env; sa.ra =3D 0; + sa.mmu_index =3D cpu_mmu_index_kernel(env); sa.sp_mask =3D -1; sa.ss_base =3D 0; if (dpl < cpl || ist !=3D 0) { @@ -1116,6 +1119,7 @@ static void do_interrupt_real(CPUX86State *env, int i= ntno, int is_int, sa.sp =3D env->regs[R_ESP]; sa.sp_mask =3D 0xffff; sa.ss_base =3D env->segs[R_SS].base; + sa.mmu_index =3D cpu_mmu_index_kernel(env); =20 if (is_int) { old_eip =3D next_eip; @@ -1579,6 +1583,7 @@ void helper_lcall_real(CPUX86State *env, uint32_t new= _cs, uint32_t new_eip, sa.sp =3D env->regs[R_ESP]; sa.sp_mask =3D get_sp_mask(env->segs[R_SS].flags); sa.ss_base =3D env->segs[R_SS].base; + sa.mmu_index =3D cpu_mmu_index_kernel(env); =20 if (shift) { pushl(&sa, env->segs[R_CS].selector); @@ -1618,6 +1623,7 @@ void helper_lcall_protected(CPUX86State *env, int new= _cs, target_ulong new_eip, =20 sa.env =3D env; sa.ra =3D GETPC(); + sa.mmu_index =3D cpu_mmu_index_kernel(env); =20 if (e2 & DESC_S_MASK) { if (!(e2 & DESC_CS_MASK)) { @@ -1905,6 +1911,7 @@ void helper_iret_real(CPUX86State *env, int shift) =20 sa.env =3D env; sa.ra =3D GETPC(); + sa.mmu_index =3D x86_mmu_index_pl(env, 0); sa.sp_mask =3D 0xffff; /* XXXX: use SS segment size? */ sa.sp =3D env->regs[R_ESP]; sa.ss_base =3D env->segs[R_SS].base; @@ -1976,8 +1983,11 @@ static inline void helper_ret_protected(CPUX86State = *env, int shift, target_ulong new_eip, new_esp; StackAccess sa; =20 + cpl =3D env->hflags & HF_CPL_MASK; + sa.env =3D env; sa.ra =3D retaddr; + sa.mmu_index =3D x86_mmu_index_pl(env, cpl); =20 #ifdef TARGET_X86_64 if (shift =3D=3D 2) { @@ -2032,7 +2042,6 @@ static inline void helper_ret_protected(CPUX86State *= env, int shift, !(e2 & DESC_CS_MASK)) { raise_exception_err_ra(env, EXCP0D_GPF, new_cs & 0xfffc, retaddr); } - cpl =3D env->hflags & HF_CPL_MASK; rpl =3D new_cs & 3; if (rpl < cpl) { raise_exception_err_ra(env, EXCP0D_GPF, new_cs & 0xfffc, retaddr); --=20 2.45.2