From patchwork Fri Oct 1 17:11:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 515071 Delivered-To: patch@linaro.org Received: by 2002:a02:606e:0:0:0:0:0 with SMTP id d46csp1009183jaf; Fri, 1 Oct 2021 10:28:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBJGw9928+5oYA7ubYWAw8WiY/GeDsJel+fYCGcqoJVepqcY0E9TiRaJV1tWEhw+YNqLQb X-Received: by 2002:ab0:5b03:: with SMTP id u3mr11370678uae.41.1633109316409; Fri, 01 Oct 2021 10:28:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633109316; cv=none; d=google.com; s=arc-20160816; b=jKswf3uZtnzr/tfkw6LKgNYbOg/zgD4fYycd9lVI8IDLhKxRybZwKCSLzp+rbKFhQW 9GkVSpOsbpnSOeJy6KtHgRz7bS8qQWVn3KHl7/vuEFH6nIItJP98Zp+BiT7kzhWxNqqt QlYcgYTTBG/O17Z+TgachQropMdDV4l64hlfMHxKa33d+pG/F0KzshwlBV3rL647sgAF sUTgYK3Hn01FiQlxGB1ut/YMy6ZgUnd70jTUPI3lBwO+w+P6NN8oO3PEcVrUC6oGH9Be 38iYtGzrW3aFDJVE5CjtiUuep0MV6fFRMHcO5s6tZpgrdr4e9o0rkN1E9Hu9mFwASBfU 3AnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=6mS1vCOgpN+V+J5nlq9LKRVT4rEwhx/pTcxKt2Kvegg=; b=Z/wvyxiAIAAP7FPC0iYRqsMtWFp6QG44IoT2lXZNqEA5vVX6rEacnor91kKi9dt7zf GhJW3EraR7KNOCqNRe4yzdjpKcRJb7frDaJaRd5XXoKhYMkYTfWcAr8e8Mv5tX3KmKEa avpGGgiOwrmGnrGYkk6+0Zq8stfk35Xlt2Y0Qg376IQ/OzyJgZnmYjxkApCo4wQq+aeZ mr+oh/lnp4e0nyar9r12VBYqaAUOFb6LFEHqKN5ScQXmFstcBIbRpWRKlebeSqkQUYzg nR4JW5+nNPs4Wqhw0MO9sCzUT9LLaADXSsG1+KlqmmyFVS3aKMXOUYq3x+sAr0helOHk N4jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=oMEguWAN; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x9si1189549vse.322.2021.10.01.10.28.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Oct 2021 10:28:36 -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=fail header.i=@linaro.org header.s=google header.b=oMEguWAN; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWMKp-0005MC-OI for patch@linaro.org; Fri, 01 Oct 2021 13:28:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWM5C-0005AE-Ad for qemu-devel@nongnu.org; Fri, 01 Oct 2021 13:12:26 -0400 Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]:46068) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWM5A-0005Hn-8A for qemu-devel@nongnu.org; Fri, 01 Oct 2021 13:12:25 -0400 Received: by mail-qt1-x832.google.com with SMTP id r1so9592328qta.12 for ; Fri, 01 Oct 2021 10:12:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6mS1vCOgpN+V+J5nlq9LKRVT4rEwhx/pTcxKt2Kvegg=; b=oMEguWANqVRdFfaZpS+NyyN+QKTmwzS+fxLIpoBkuqlzDSV4fDFnSKR7qiQdlkp/cS 54keSaotJBTMjhySIX7D0RLzfOx1+kkUuDC7oASlf3bgeeOeUZH71iX8Jka9NWUEaQ+T n7DhU3e6m35cT2E4QpZjMnjqlE2ay69j/mc78DZHnm1zrs+YwzcKBBJrKaIqtfPPJjeK cjZhKgTiQ5muoGIua3TwA8vLJeL/oRKMaU2Fx+zgcFvYR5e6iNakyzNT0kDs0nXj5eRp rAvEy/x0zWJHfPj+36wLRFK1qZ1mEHMgcliwQOaxcURXPjJVXcXom2B7FqLaOnu7RqrB 08Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6mS1vCOgpN+V+J5nlq9LKRVT4rEwhx/pTcxKt2Kvegg=; b=6I6dui6HtNX+2B2SHaM2E0ybPr89sCSF5yhzXNSf3OB+aw/3zhrtw5LhGl0vOD8iov /7bIxndnhib/+hp249uPrcoy50zhdyarCszJhd4ZYdHCFy0+JbfHwYywsy6EOaePU0bG ihzsfKsKnJaHwRXqRQyU7F+rFAAEjPmVTwuvkKjocoSFeWTcdUKhGTjO6EI2N/mgP+Ek kfkBDVm6tJ1k2w69SqYA6JRfLfWwldpYr3FvBQemRIiACb+t+yGuguCkcytmrfTMOavM EXp7Li0xZXOEMb07wbMjSBMgAW4EHdoZcWO33jR9TRTJQptXmi/XG/Ae985PiVizzQIQ F2og== X-Gm-Message-State: AOAM530bDJ81C1IU+WGJIM5SoFkVd2pwPWywBgMJLNaSYK4wvbkf6fbQ Wb8TkBk4bGYFEtUkWJbkODq0SiqLnVvO2g== X-Received: by 2002:ac8:148b:: with SMTP id l11mr14304016qtj.298.1633108339652; Fri, 01 Oct 2021 10:12:19 -0700 (PDT) Received: from localhost.localdomain (c-67-174-166-185.hsd1.ga.comcast.net. [67.174.166.185]) by smtp.gmail.com with ESMTPSA id y15sm3557250qko.78.2021.10.01.10.12.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Oct 2021 10:12:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 30/41] target/mips: Make mips_cpu_tlb_fill sysemu only Date: Fri, 1 Oct 2021 13:11:40 -0400 Message-Id: <20211001171151.1739472-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211001171151.1739472-1-richard.henderson@linaro.org> References: <20211001171151.1739472-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::832; envelope-from=richard.henderson@linaro.org; helo=mail-qt1-x832.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The fallback code in raise_sigsegv is sufficient for mips linux-user. This means we can remove tcg/user/tlb_helper.c entirely. Remove the code from cpu_loop that raised SIGSEGV. Signed-off-by: Richard Henderson --- target/mips/tcg/tcg-internal.h | 7 ++-- linux-user/mips/cpu_loop.c | 11 ------ target/mips/cpu.c | 2 +- target/mips/tcg/user/tlb_helper.c | 59 ------------------------------- target/mips/tcg/meson.build | 3 -- target/mips/tcg/user/meson.build | 3 -- 6 files changed, 5 insertions(+), 80 deletions(-) delete mode 100644 target/mips/tcg/user/tlb_helper.c delete mode 100644 target/mips/tcg/user/meson.build -- 2.25.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/target/mips/tcg/tcg-internal.h b/target/mips/tcg/tcg-internal.h index bad3deb611..466768aec4 100644 --- a/target/mips/tcg/tcg-internal.h +++ b/target/mips/tcg/tcg-internal.h @@ -18,9 +18,6 @@ void mips_tcg_init(void); void mips_cpu_synchronize_from_tb(CPUState *cs, const TranslationBlock *tb); -bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int size, - MMUAccessType access_type, int mmu_idx, - bool probe, uintptr_t retaddr); void mips_cpu_do_unaligned_access(CPUState *cpu, vaddr addr, MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) QEMU_NORETURN; @@ -60,6 +57,10 @@ void mips_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, MemTxResult response, uintptr_t retaddr); void cpu_mips_tlb_flush(CPUMIPSState *env); +bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr); + #endif /* !CONFIG_USER_ONLY */ #endif diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c index cb03fb066b..b735c99a24 100644 --- a/linux-user/mips/cpu_loop.c +++ b/linux-user/mips/cpu_loop.c @@ -158,17 +158,6 @@ done_syscall: } env->active_tc.gpr[2] = ret; break; - case EXCP_TLBL: - case EXCP_TLBS: - case EXCP_AdEL: - case EXCP_AdES: - info.si_signo = TARGET_SIGSEGV; - info.si_errno = 0; - /* XXX: check env->error_code */ - info.si_code = TARGET_SEGV_MAPERR; - info._sifields._sigfault._addr = env->CP0_BadVAddr; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - break; case EXCP_CpU: case EXCP_RI: info.si_signo = TARGET_SIGILL; diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 00e0c55d0e..4aae23934b 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -539,9 +539,9 @@ static const struct SysemuCPUOps mips_sysemu_ops = { static const struct TCGCPUOps mips_tcg_ops = { .initialize = mips_tcg_init, .synchronize_from_tb = mips_cpu_synchronize_from_tb, - .tlb_fill = mips_cpu_tlb_fill, #if !defined(CONFIG_USER_ONLY) + .tlb_fill = mips_cpu_tlb_fill, .cpu_exec_interrupt = mips_cpu_exec_interrupt, .do_interrupt = mips_cpu_do_interrupt, .do_transaction_failed = mips_cpu_do_transaction_failed, diff --git a/target/mips/tcg/user/tlb_helper.c b/target/mips/tcg/user/tlb_helper.c deleted file mode 100644 index 210c6d529e..0000000000 --- a/target/mips/tcg/user/tlb_helper.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * MIPS TLB (Translation lookaside buffer) helpers. - * - * Copyright (c) 2004-2005 Jocelyn Mayer - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see . - */ -#include "qemu/osdep.h" - -#include "cpu.h" -#include "exec/exec-all.h" -#include "internal.h" - -static void raise_mmu_exception(CPUMIPSState *env, target_ulong address, - MMUAccessType access_type) -{ - CPUState *cs = env_cpu(env); - - env->error_code = 0; - if (access_type == MMU_INST_FETCH) { - env->error_code |= EXCP_INST_NOTAVAIL; - } - - /* Reference to kernel address from user mode or supervisor mode */ - /* Reference to supervisor address from user mode */ - if (access_type == MMU_DATA_STORE) { - cs->exception_index = EXCP_AdES; - } else { - cs->exception_index = EXCP_AdEL; - } - - /* Raise exception */ - if (!(env->hflags & MIPS_HFLAG_DM)) { - env->CP0_BadVAddr = address; - } -} - -bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int size, - MMUAccessType access_type, int mmu_idx, - bool probe, uintptr_t retaddr) -{ - MIPSCPU *cpu = MIPS_CPU(cs); - CPUMIPSState *env = &cpu->env; - - /* data access */ - raise_mmu_exception(env, address, access_type); - do_raise_exception_err(env, cs->exception_index, env->error_code, retaddr); -} diff --git a/target/mips/tcg/meson.build b/target/mips/tcg/meson.build index 8f6f7508b6..98003779ae 100644 --- a/target/mips/tcg/meson.build +++ b/target/mips/tcg/meson.build @@ -28,9 +28,6 @@ mips_ss.add(when: 'TARGET_MIPS64', if_true: files( 'mxu_translate.c', )) -if have_user - subdir('user') -endif if have_system subdir('sysemu') endif diff --git a/target/mips/tcg/user/meson.build b/target/mips/tcg/user/meson.build deleted file mode 100644 index 79badcd321..0000000000 --- a/target/mips/tcg/user/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -mips_user_ss.add(files( - 'tlb_helper.c', -))