From patchwork Sat Jul 15 09:42:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9842223 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 22E81602BD for ; Sat, 15 Jul 2017 09:45:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10F4D28706 for ; Sat, 15 Jul 2017 09:45:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 047C02872B; Sat, 15 Jul 2017 09:45:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C99D728706 for ; Sat, 15 Jul 2017 09:45:40 +0000 (UTC) Received: from localhost ([::1]:41305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWJds-00054Z-1m for patchwork-qemu-devel@patchwork.kernel.org; Sat, 15 Jul 2017 05:45:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWJbM-0003bW-Es for qemu-devel@nongnu.org; Sat, 15 Jul 2017 05:43:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dWJbL-0003E5-K1 for qemu-devel@nongnu.org; Sat, 15 Jul 2017 05:43:04 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:34322) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dWJbL-0003Dt-ED for qemu-devel@nongnu.org; Sat, 15 Jul 2017 05:43:03 -0400 Received: by mail-pg0-x242.google.com with SMTP id j186so13345946pge.1 for ; Sat, 15 Jul 2017 02:43:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=v7WGv3BH4klOGL4TNykm0pjMZLu7EoBx9oZhVsyhFVo=; b=iqnT/Zp+nNdN3wapj1Tv2hXx8fo+xYm2Ozf26u0lC6fsLWSdQ/gvL8qzMmL5tl+Wlu dMbH+xlnDumQKRo3gFCH5XY0IZ6eWQ8t1LXxxjLbSBKBWpLMNeX1m4qsga42yIxiuMtV riFhS5UxcWJuplht64PJqXDWhyY4wVfv1gdIbK3IK+32GLRiXAHqhNrBZLKMb/kOIabC q5Ofl9ym9OjFtrgLL6f37FFkAqJ78wEgU9kjG2mFFgSngQzjOmSSaEXD3/O4mNDB2RhC JwfnMnzDNTFNbG4JSz1OpUZ3ikNQlFyLEmcYyqjEgY2ZYbL8shW9hZB/gCPpK0CFMqO1 uWIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=v7WGv3BH4klOGL4TNykm0pjMZLu7EoBx9oZhVsyhFVo=; b=WZQUbQ36pjHjyQfCgbo1NZTJEaMj0/XChkN/LmuhQ78iM7/Gdk53UUzJbsntjP9i68 EJF45r4/BAwfkCNWR5/hKQc+iR5gFpKeRZLe/ULlDEMI6K0iuCdTBxESwFV+DMfemOcb mIZymsQAVZTOe5ie1lh3qtt/G30rwYj3xY6JLrYVuPSlecNaxFvPTL3EFSkaFpbF+K5R Ybi4CwTbfLcat2YBXNJLiVmmx77o57+XCEgNOBQ4hpjelsmH1KMGN/CA/o0HypqtqhCJ Q4nYY7Um1t6sQzMcPR3tuIgZr1keKW1wNCAvDAFSOtNq8fmr4CxaQkNoPDejicqb1SGd R62w== X-Gm-Message-State: AIVw111y95zSkr2iJsifiUa1ogLiK4//oF44dVISFjWQGU6bk1aN+JDb KzVqLcfLbI55LdF6sLQ= X-Received: by 10.84.143.34 with SMTP id 31mr20509167ply.198.1500111782337; Sat, 15 Jul 2017 02:43:02 -0700 (PDT) Received: from bigtime.twiddle.net (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id c63sm27368589pfk.79.2017.07.15.02.43.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Jul 2017 02:43:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 14 Jul 2017 23:42:15 -1000 Message-Id: <20170715094243.28371-7-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170715094243.28371-1-rth@twiddle.net> References: <20170715094243.28371-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PATCH v14 06/34] target/arm: Delay check for magic kernel page X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, cota@braap.org, alex.bennee@linaro.org, vilanova@ac.upc.edu, crosthwaite.peter@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP There's nothing magic about the exception that we generate in order to execute the magic kernel page. We can and should allow gdb to set a breakpoint at this location. Signed-off-by: Richard Henderson Reviewed-by: Emilio G. Cota --- target/arm/translate.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/target/arm/translate.c b/target/arm/translate.c index fea76fb..2ae68ce 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -11930,17 +11930,6 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) 0); num_insns++; -#ifdef CONFIG_USER_ONLY - /* Intercept jump to the magic kernel page. */ - if (dc->pc >= 0xffff0000) { - /* We always get here via a jump, so know we are not in a - conditional execution block. */ - gen_exception_internal(EXCP_KERNEL_TRAP); - dc->is_jmp = DISAS_NORETURN; - break; - } -#endif - if (unlikely(!QTAILQ_EMPTY(&cs->breakpoints))) { CPUBreakpoint *bp; QTAILQ_FOREACH(bp, &cs->breakpoints, entry) { @@ -11972,6 +11961,17 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) gen_io_start(); } +#ifdef CONFIG_USER_ONLY + /* Intercept jump to the magic kernel page. */ + if (dc->pc >= 0xffff0000) { + /* We always get here via a jump, so know we are not in a + conditional execution block. */ + gen_exception_internal(EXCP_KERNEL_TRAP); + dc->is_jmp = DISAS_NORETURN; + break; + } +#endif + if (dc->ss_active && !dc->pstate_ss) { /* Singlestep state is Active-pending. * If we're in this state at the start of a TB then either