From patchwork Fri Oct 15 04:10:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 515803 Delivered-To: patch@linaro.org Received: by 2002:ac0:da11:0:0:0:0:0 with SMTP id d17csp140395imi; Thu, 14 Oct 2021 21:27:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9psZQGutlUSt/mSaia8xx+gTS/G01GdNe1acwI46UpRbWMJwWddXyfWJ+f+8PB36m0sVt X-Received: by 2002:a25:d94d:: with SMTP id q74mr10008828ybg.196.1634272025860; Thu, 14 Oct 2021 21:27:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634272025; cv=none; d=google.com; s=arc-20160816; b=fPGRDm0tu8r2/a0OGus4xiMGhxpMJCzr+GBRm/f3VvjatZ6WL5/hSfOMn9L1ytyA9o FTW2p/Bk40yiB1z/Era79We5eaMfxvcuuslf/nVc9CPxB/jt/I4R69zakiiL80fEJ398 RowRXoYWJYGZnN9dD3b5B5G+MqJC9AbnL+WOxzsabvLcFfOvP6fHEOEplx7nxOtYpSae wTcH3976Ntiynan8JYWPVXtFaRR5HSSXngHJaSGdgTzQmAHmfe9wo1n6zkcql3qgyH7W wDKygJ+yG5/RaAoWRh1hVjPQ3GcHICZMZQhKqSpgJsKqj5jGv0XXRe0qybPanx3/QPxF n8ew== 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=tIWq1Y9Lh6wr1x/ixIjLaUf11V/zxN9xw2JRcPgovYc=; b=d+7X8iL5+qXMYVfYPNLh/0kyJF8U+2Tf4/ny8tY9KqgBZ8/QXdSRlKV75fNBekjB9X dVjcudNqpP8rk5gRfTg+OzjwF+GOVwTP+ypoBY3GLtrI/Yxt5NBhouBj5xMzRMww6MVl heltZeugSUnHOPi3JLWTLf9MzJUFB1/rfJT1LeHQmVKF1PJcC6zqDO2CSDeQ9f6jV5qw WGg+qoFPU+MdU1NLEuHdyri60YpiOpMfDm2OcF5FM7nR0IxvVdgIfd/xOa2t8np+FMIQ US1x6SEJVB+p9vXCeaqM+JO4qXPbFQYvcbuFbuYLdjNgox1RFN8WQBNI+r1n8u4Rsi1A gPDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="a/sYVd+U"; 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 m74si6215701ybm.499.2021.10.14.21.27.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Oct 2021 21:27:05 -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="a/sYVd+U"; 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]:45570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mbEoD-0007TD-5B for patch@linaro.org; Fri, 15 Oct 2021 00:27:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbEZ4-0007QR-KB for qemu-devel@nongnu.org; Fri, 15 Oct 2021 00:11:27 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]:34547) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mbEZ0-0000PR-Bu for qemu-devel@nongnu.org; Fri, 15 Oct 2021 00:11:26 -0400 Received: by mail-pl1-x635.google.com with SMTP id g5so5614833plg.1 for ; Thu, 14 Oct 2021 21:11: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=tIWq1Y9Lh6wr1x/ixIjLaUf11V/zxN9xw2JRcPgovYc=; b=a/sYVd+UX7TZVckOcnEM+bcpnsACj/r+4bKYFBAB+UOgzyfHevirk7crsSwBoXuZ6c 0LK5rrAAD93ql+K/9ylRCP/FqsmhyKcRwbnpBX/Er7fNN9l9kl2Mr3b5FnkW/Mfnsf2J ytJCb3cq9xlopOlFgmcdJ9ovWNXczFzF6v/MK3g57zc9k6uUi7nwebNWp8t4wLCRI8z6 lsKYexKLVOegebBkFpx1PaCUFzNTtjJewerYzxmEb4nXk3FYOer9rd3Y6dJcSCvQFzzv XKb9KSIbxH+uZ4LCQk+BlStkk4CptD/8hAr/IkgK2NG0zvtTfln06WHMRApmlkw8j33/ DCGw== 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=tIWq1Y9Lh6wr1x/ixIjLaUf11V/zxN9xw2JRcPgovYc=; b=ac+9wzQBLa9X3wSkR3TPjcKbuMG/4M8a1GV75CImkDlJlvEfFQJvxLhv02Vnd+9zKF fJzRLP9+AAgFrvjHGbiSH0z2pce2ur43TGzS99NPqoiyP/Wk27BCceHKbEjmPCOWTujb 9TwCZSfkI6aG4NieOvc6OrilxZVMwGN2uzRjfU4YK0EKSYuwcykbwe3bywcmiQyoo8CD +zNMak5/ZW0uZY0uOceaN1a2ia4V+PgFJHqo5jtiSt6onRytHJnV4QL6Z5EIdSFcklzh 9irPxeKzu5fLaNR+FwQxdW7HEkyGgw9DNcurKbVfioiExTzu32g3yNxm58r7MpNh4n8h nKmA== X-Gm-Message-State: AOAM533uOISa3WbXURyZgHYOypR7pQWTqKiCn8X83N0uaIpedefaPgoa iPkw2mX1jIB1nHLNsX4hb4nuMeuqjRvMJQ== X-Received: by 2002:a17:90a:c081:: with SMTP id o1mr25714632pjs.24.1634271079903; Thu, 14 Oct 2021 21:11:19 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id me12sm5718006pjb.27.2021.10.14.21.11.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 21:11:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 30/67] target/mips: Make mips_cpu_tlb_fill sysemu only Date: Thu, 14 Oct 2021 21:10:16 -0700 Message-Id: <20211015041053.2769193-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211015041053.2769193-1-richard.henderson@linaro.org> References: <20211015041053.2769193-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x635.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, imp@bsdimp.com, =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The fallback code in cpu_loop_exit_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. Reviewed-by: Philippe Mathieu-Daudé 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: Warner Losh Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
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', -))