From patchwork Thu Apr 24 00:48:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883800 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3199548wrs; Wed, 23 Apr 2025 17:58:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW13wSY9tIqTPD1cbVB6HFFlBEQrmEyRORir9rmJQXyyrCc4t/KkBgmp5oIr9nRXtLyrf0OuA==@linaro.org X-Google-Smtp-Source: AGHT+IEFfr8CPIloK6S9VgEfx9iSzgGEVulLeGWelPxBjD9zjk+o23Y5vbqhHP68IV6xwPpwVaQ6 X-Received: by 2002:a05:6214:f23:b0:6e8:98a1:3694 with SMTP id 6a1803df08f44-6f4bfbaf44bmr16159646d6.8.1745456280952; Wed, 23 Apr 2025 17:58:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745456280; cv=none; d=google.com; s=arc-20240605; b=MnVnF6lRS2Flf0/HmbridroFx8ebsc5UNn5R7Qc5QXW58tRX4EGDRjYs85fpbmBCUx YDeiGB47Wtf0B8LbL7qxIyvUTAbHZQrG286G59eNXUldK1p0shHLrs2+ue962uEjW35J +IECKbTs/W9UNholiS8exk7fGtQETW7PXBn+F1XVgD/fjNKZitu3kvhedB8xYhXgEbmc mL4TpM8QdRHIsgo6cgQdo9A5MRjs95YUANGR4MlNtXjlaKcw89YhXfEhJWBNFvcEKXDH n21r4W5cJTBmXSLFLvWH3UqgwInnNXmcJIJ9tRjWD9NtW6ONr5GPMn8digfaov1SfQ3T A0EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:dkim-signature; bh=HFv25Ex4Z7rH8n6+d4m5k/9OCPtpQ36hSXK/gOJIqjc=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=QBf+UiMzxgKPdZBF0drZpSQdNzMcvWjGK0lnoDNZcUcD0NHSddS6529V+74KEjKaNO 0Fv28EMvl+0sZNhZK2aLwDcCbz3cWVYn61kCMZmCnRicdygqwNAFK+IE0Ir5jR8naijk sjrpi0peWh3jk4mkeQIH2mQopEpuj0dTJ/K4r/FG59D7jMn95aW3OzWqlhk78IhUFBR8 qqUKyNR6NEkLF7+UCQaQiWqH82INgKJbSF4kBsZhmXCk5SXyX7B7m4uCJxW8ldsFfxsa 30Rm+QMSxtocR7IA0tQqetbMuVwVChH3dXZ3WAYrhqpbefehB4LY22PEryJqlJVl79M5 mLwA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FwDIVFuc; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f4c08d27c0si3733306d6.54.2025.04.23.17.58.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Apr 2025 17:58:00 -0700 (PDT) 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; dkim=pass header.i=@linaro.org header.s=google header.b=FwDIVFuc; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7krc-0005GR-LT; Wed, 23 Apr 2025 20:54:53 -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 1u7kqX-00015p-Sg for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:53:46 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7kqN-0004lp-1W for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:53:36 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-7399a2dc13fso535207b3a.2 for ; Wed, 23 Apr 2025 17:53:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745456014; x=1746060814; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HFv25Ex4Z7rH8n6+d4m5k/9OCPtpQ36hSXK/gOJIqjc=; b=FwDIVFucvmK8vUOrACvsAgoKHCo3VQWiMktmOEVyWBZyzFjqytvZk8ZY32UKisTZ+n B3N4ljho39RKsdM1Q0xAOMcXAnTrYIWgJ+GRIAD3zNhyPPwNnnpyLKIRqWUjDI/BJ1dl NQ19BnYK7nKXK6KdVa4soZphjyN5e7NdyFku5VaAntu1UXI2xiF0/BT5DpV109Z57wgq 4KQZcxXcclyEWyVRjMrLtNNODTUfbM5yz5W18gewdN8HSMUcmoPvc+hg/ebvVOXW2iVw iD8ulK+o9WURqaw0cIR4bB5ziqTjGBgwvQRJxu+tfeaAmhSacp3DN2l3iSf0XGYQPgeY rYpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745456014; x=1746060814; 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=HFv25Ex4Z7rH8n6+d4m5k/9OCPtpQ36hSXK/gOJIqjc=; b=JlNk5fT2SyOiVQLYtVBNw9sJNdM7g66D4g71KkTwE7hhk7TYhOdgHXnCrtjtUFQ6OP 98zuao0YJVfO1M0WMRWlW/z0kf5ox49ojVuD/A9crmnazzna714dU2bMZvp/jfIerOOl Fg4aHdDEj6slzNBjlS6mGdKcuPGgXt6lj23pWhMiGJemyKlSA3iD7a0TMB5Nfjeg0hlg L2OPz/7CnIr8ibfKlDibTJ/zAJOZwXLyvgCz/yLVTTJWcxkymfk1+sabPk5C90HthATm LQBlgMgnRA1wVEGO7ayjKJ5ZN21Fuw3bHu0EDXEejBord3H1kK32x6tc2lIwx3hd9LvR aUig== X-Gm-Message-State: AOJu0Ywrolu0GYJQYJPu4DRZuCk/gfYdecnZjuHkirw8ZSm7a86Ssdh6 mqqTpaNSPzimEz3Vmn5pJ0m5o8vQzUwOBgawlXPkSrMguCPHJEphNGSJR4qdZn5jgt167hrja/U 2 X-Gm-Gg: ASbGncuqvqwA2pAH5GoXTMmQwxkwwidloDyJbia5yWGgP0+b178fON7iZmUhRdYbAU7 MnrvdQwmabJT2PS2+a94T59m7Q1XdNN8+pQSl7XXlroHJ1vClkqjGGy5CtQcGEv2iW2I8tyvcex 5GzJTZH2XA87++szRbhX3igvqgb6BaU490X8nwggGPygKo+eKH1/78JWsdQph/MBaVVfja2HUG+ 4nY0b+iunCo5m5argzMYOQHfiv9Hl2Apge3re5suK5JqLTmDr4Rff0+d1IgXZ2vV0yj55lAY3Gx Ju2j4KPH3Yi/qm6O8/Ubbn7d4IlcYGdmJNeuV7GzAOD8Ix14iFDGFHnbU7i1PV0CksKspsVGBV6 lHyqycSEW5g== X-Received: by 2002:a05:6a00:9287:b0:736:546c:eb69 with SMTP id d2e1a72fcca58-73e245e3df6mr932620b3a.9.1745456013530; Wed, 23 Apr 2025 17:53:33 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25a6a971sm209353b3a.103.2025.04.23.17.53.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 17:53:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 079/148] target/i386: Restrict cpu_mmu_index_kernel() to TCG Date: Wed, 23 Apr 2025 17:48:24 -0700 Message-ID: <20250424004934.598783-80-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250424004934.598783-1-richard.henderson@linaro.org> References: <20250424004934.598783-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42b.google.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, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Move cpu_mmu_index_kernel() to seg_helper.c. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Richard Henderson Message-ID: <20250401080938.32278-9-philmd@linaro.org> --- target/i386/cpu.h | 1 - target/i386/tcg/seg_helper.h | 4 ++++ target/i386/cpu.c | 16 ---------------- target/i386/tcg/seg_helper.c | 16 ++++++++++++++++ 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 119efc6c60..c9f39e99d3 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2598,7 +2598,6 @@ static inline bool is_mmu_index_32(int mmu_index) } int x86_mmu_index_pl(CPUX86State *env, unsigned pl); -int cpu_mmu_index_kernel(CPUX86State *env); #define CC_DST (env->cc_dst) #define CC_SRC (env->cc_src) diff --git a/target/i386/tcg/seg_helper.h b/target/i386/tcg/seg_helper.h index 6b8606cd6d..ea98e1a98e 100644 --- a/target/i386/tcg/seg_helper.h +++ b/target/i386/tcg/seg_helper.h @@ -20,6 +20,8 @@ #ifndef SEG_HELPER_H #define SEG_HELPER_H +#include "cpu.h" + //#define DEBUG_PCALL #ifdef DEBUG_PCALL @@ -31,6 +33,8 @@ # define LOG_PCALL_STATE(cpu) do { } while (0) #endif +int cpu_mmu_index_kernel(CPUX86State *env); + /* * TODO: Convert callers to compute cpu_mmu_index_kernel once * and use *_mmuidx_ra directly. diff --git a/target/i386/cpu.c b/target/i386/cpu.c index c596e2174d..fd85663833 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -8681,22 +8681,6 @@ static int x86_cpu_mmu_index(CPUState *cs, bool ifetch) return x86_mmu_index_pl(env, env->hflags & HF_CPL_MASK); } -static int x86_mmu_index_kernel_pl(CPUX86State *env, unsigned pl) -{ - int mmu_index_32 = (env->hflags & HF_LMA_MASK) ? 0 : 1; - int mmu_index_base = - !(env->hflags & HF_SMAP_MASK) ? MMU_KNOSMAP64_IDX : - (pl < 3 && (env->eflags & AC_MASK) - ? MMU_KNOSMAP64_IDX : MMU_KSMAP64_IDX); - - return mmu_index_base + mmu_index_32; -} - -int cpu_mmu_index_kernel(CPUX86State *env) -{ - return x86_mmu_index_kernel_pl(env, env->hflags & HF_CPL_MASK); -} - static void x86_disas_set_info(CPUState *cs, disassemble_info *info) { X86CPU *cpu = X86_CPU(cs); diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index 71962113fb..f4370202fe 100644 --- a/target/i386/tcg/seg_helper.c +++ b/target/i386/tcg/seg_helper.c @@ -128,6 +128,22 @@ int get_pg_mode(CPUX86State *env) return pg_mode; } +static int x86_mmu_index_kernel_pl(CPUX86State *env, unsigned pl) +{ + int mmu_index_32 = (env->hflags & HF_LMA_MASK) ? 0 : 1; + int mmu_index_base = + !(env->hflags & HF_SMAP_MASK) ? MMU_KNOSMAP64_IDX : + (pl < 3 && (env->eflags & AC_MASK) + ? MMU_KNOSMAP64_IDX : MMU_KSMAP64_IDX); + + return mmu_index_base + mmu_index_32; +} + +int cpu_mmu_index_kernel(CPUX86State *env) +{ + return x86_mmu_index_kernel_pl(env, env->hflags & HF_CPL_MASK); +} + /* return non zero if error */ static inline int load_segment_ra(CPUX86State *env, uint32_t *e1_ptr, uint32_t *e2_ptr, int selector,