From patchwork Thu Nov 11 09:55:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 1553844 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HqcYZ3tFwz9s0r for ; Thu, 11 Nov 2021 20:56:18 +1100 (AEDT) Received: from localhost ([::1]:38742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ml6oa-0007LK-3y for incoming@patchwork.ozlabs.org; Thu, 11 Nov 2021 04:56:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ml6nZ-0007JN-Ci for qemu-devel@nongnu.org; Thu, 11 Nov 2021 04:55:14 -0500 Received: from mail.ispras.ru ([83.149.199.84]:44968) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ml6nX-0008OB-Dv for qemu-devel@nongnu.org; Thu, 11 Nov 2021 04:55:13 -0500 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id 1D48740755CE; Thu, 11 Nov 2021 09:55:09 +0000 (UTC) Subject: [PATCH v2 1/3] icount: preserve cflags when custom tb is about to execute From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Thu, 11 Nov 2021 12:55:08 +0300 Message-ID: <163662450891.125458.6706022775465303586.stgit@pasha-ThinkPad-X280> In-Reply-To: <163662450348.125458.5494710452733592356.stgit@pasha-ThinkPad-X280> References: <163662450348.125458.5494710452733592356.stgit@pasha-ThinkPad-X280> User-Agent: StGit/0.23 MIME-Version: 1.0 Received-SPF: pass client-ip=83.149.199.84; envelope-from=pavel.dovgalyuk@ispras.ru; helo=mail.ispras.ru X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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: , Cc: pavel.dovgalyuk@ispras.ru, david@redhat.com, richard.henderson@linaro.org, peterx@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When debugging with the watchpoints, qemu may need to create TB with single instruction. This is achieved by setting cpu->cflags_next_tb. But when this block is about to execute, it may be interrupted by another thread. In this case cflags will be lost and next executed TB will not be the special one. This patch checks TB exit reason and restores cflags_next_tb to allow finding the interrupted block. Signed-off-by: Pavel Dovgalyuk Signed-off-by: Alex Bennée --- accel/tcg/cpu-exec.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 2d14d02f6c..df12452b8f 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -846,6 +846,16 @@ static inline void cpu_loop_exec_tb(CPUState *cpu, TranslationBlock *tb, * cpu_handle_interrupt. cpu_handle_interrupt will also * clear cpu->icount_decr.u16.high. */ + if (cpu->cflags_next_tb == -1 + && (!use_icount || !(tb->cflags & CF_USE_ICOUNT) + || cpu_neg(cpu)->icount_decr.u16.low >= tb->icount)) { + /* + * icount is disabled or there are enough instructions + * in the budget, do not retranslate this block with + * different parameters. + */ + cpu->cflags_next_tb = tb->cflags; + } return; } From patchwork Thu Nov 11 09:55:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 1553846 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HqcbH2FYQz9s1l for ; Thu, 11 Nov 2021 20:57:47 +1100 (AEDT) Received: from localhost ([::1]:44924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ml6q1-00038T-3Y for incoming@patchwork.ozlabs.org; Thu, 11 Nov 2021 04:57:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ml6ne-0007L2-H5 for qemu-devel@nongnu.org; Thu, 11 Nov 2021 04:55:19 -0500 Received: from mail.ispras.ru ([83.149.199.84]:44988) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ml6nb-0008Oh-VS for qemu-devel@nongnu.org; Thu, 11 Nov 2021 04:55:17 -0500 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id 7E03840A2BC1; Thu, 11 Nov 2021 09:55:14 +0000 (UTC) Subject: [PATCH v2 2/3] softmmu: fix watchpoint-interrupt races From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Thu, 11 Nov 2021 12:55:14 +0300 Message-ID: <163662451431.125458.14945698834107669531.stgit@pasha-ThinkPad-X280> In-Reply-To: <163662450348.125458.5494710452733592356.stgit@pasha-ThinkPad-X280> References: <163662450348.125458.5494710452733592356.stgit@pasha-ThinkPad-X280> User-Agent: StGit/0.23 MIME-Version: 1.0 Received-SPF: pass client-ip=83.149.199.84; envelope-from=pavel.dovgalyuk@ispras.ru; helo=mail.ispras.ru X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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: , Cc: pavel.dovgalyuk@ispras.ru, david@redhat.com, richard.henderson@linaro.org, peterx@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Watchpoint may be processed in two phases. First one is detecting the instruction with target memory access. And the second one is executing only one instruction and setting the debug interrupt flag. Hardware interrupts can break this sequence when they happen after the first watchpoint phase. This patch postpones the interrupt request until watchpoint is processed. Signed-off-by: Pavel Dovgalyuk Reviewed-by: Alex Bennée Reviewed-by: David Hildenbrand --- accel/tcg/cpu-exec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index df12452b8f..e4526c2f5e 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -742,6 +742,11 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, qemu_mutex_unlock_iothread(); return true; } + /* Process watchpoints first, or interrupts will ruin everything */ + if (cpu->watchpoint_hit) { + qemu_mutex_unlock_iothread(); + return false; + } #if !defined(CONFIG_USER_ONLY) if (replay_mode == REPLAY_MODE_PLAY && !replay_has_interrupt()) { /* Do nothing */ From patchwork Thu Nov 11 09:55:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 1553845 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HqcYg5qnwz9s0r for ; Thu, 11 Nov 2021 20:56:23 +1100 (AEDT) Received: from localhost ([::1]:39294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ml6of-0007kr-LH for incoming@patchwork.ozlabs.org; Thu, 11 Nov 2021 04:56:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ml6nt-0007Rh-J6 for qemu-devel@nongnu.org; Thu, 11 Nov 2021 04:55:35 -0500 Received: from mail.ispras.ru ([83.149.199.84]:45008) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ml6ni-0008T4-7j for qemu-devel@nongnu.org; Thu, 11 Nov 2021 04:55:32 -0500 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id E7B7D40A2BC1; Thu, 11 Nov 2021 09:55:19 +0000 (UTC) Subject: [PATCH v2 3/3] softmmu: fix watchpoints on memory used by vCPU internals From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Thu, 11 Nov 2021 12:55:19 +0300 Message-ID: <163662451972.125458.8046031260136838656.stgit@pasha-ThinkPad-X280> In-Reply-To: <163662450348.125458.5494710452733592356.stgit@pasha-ThinkPad-X280> References: <163662450348.125458.5494710452733592356.stgit@pasha-ThinkPad-X280> User-Agent: StGit/0.23 MIME-Version: 1.0 Received-SPF: pass client-ip=83.149.199.84; envelope-from=pavel.dovgalyuk@ispras.ru; helo=mail.ispras.ru X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 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: , Cc: pavel.dovgalyuk@ispras.ru, david@redhat.com, richard.henderson@linaro.org, peterx@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When vCPU processes interrupt request or exception, it can save register values to the memory. Watchpoints may also be set on these memory cells. In this case watchpoint processing code should not retranslate the block which accessed the memory, because there is no such block at all. "After access" watchpoint also can't be used in such case. This patch adds some conditions to prevent failures when watchpoint is set on memory used for saving the registers on interrupt request. Signed-off-by: Pavel Dovgalyuk --- softmmu/physmem.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 314f8b439c..53edcf9a51 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -886,6 +886,14 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len, assert(tcg_enabled()); if (cpu->watchpoint_hit) { + if (!ra) { + /* + * Another memory access after hitting the watchpoint. + * There is no translation block and interrupt request + * is already set. + */ + return; + } /* * We re-entered the check after replacing the TB. * Now raise the debug interrupt so that it will @@ -936,6 +944,12 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len, continue; } cpu->watchpoint_hit = wp; + if (!ra) { + /* We're not in the TB, can't stop before the access. */ + g_assert(!(wp->flags & BP_STOP_BEFORE_ACCESS)); + cpu_interrupt(cpu, CPU_INTERRUPT_DEBUG); + return; + } mmap_lock(); /* This call also restores vCPU state */