Received: from eggs.gnu.org ([2001:4830:134:3::10]:58688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAeIK-0002wR-So for qemu-devel@nongnu.org; Mon, 12 Jan 2015 07:40:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YAeIG-0005KO-VV for qemu-devel@nongnu.org; Mon, 12 Jan 2015 07:40:32 -0500 Received: from mail.ispras.ru ([83.149.199.45]:48922) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAeIG-0005K9-IU for qemu-devel@nongnu.org; Mon, 12 Jan 2015 07:40:28 -0500 From: "Pavel Dovgaluk" References: <20150112115944.3504.66763.stgit@PASHA-ISP> <20150112120032.3504.11086.stgit@PASHA-ISP> <54B3BF3B.7020403@redhat.com> In-Reply-To: <54B3BF3B.7020403@redhat.com> Date: Mon, 12 Jan 2015 15:40:27 +0300 Message-ID: <001301d02e64$f192c740$d4b855c0$@Dovgaluk@ispras.ru> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Language: ru Subject: Re: [Qemu-devel] [RFC PATCH v7 08/21] replay: interrupts and exceptions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: 'Paolo Bonzini' , qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, alex.bennee@linaro.org, mark.burton@greensocs.com, real@ispras.ru, batuzovk@ispras.ru, maria.klimushenkova@ispras.ru, afaerber@suse.de, fred.konrad@greensocs.com > From: Paolo Bonzini [mailto:pbonzini@redhat.com] > On 12/01/2015 13:00, Pavel Dovgalyuk wrote: > > > > + if (replay_exception()) { > > + cc->do_interrupt(cpu); > > + cpu->exception_index = -1; > > I cannot see replay_exception() in the series? It is in the patch number 8. > > > @@ -419,21 +434,24 @@ int cpu_exec(CPUArchState *env) > > cpu->exception_index = EXCP_DEBUG; > > cpu_loop_exit(cpu); > > Why not for EXCP_DEBUG? As far as I understand, EXCP_DEBUG is used for external debugger (like gdb). Debugger is usually connected to VM during replay. That is why we do not need to replay EXCP_DEBUG - it may appear in different places, and it does not affect on behavior of the virtual machine. > > - if (interrupt_request & CPU_INTERRUPT_HALT) { > > + if ((interrupt_request & CPU_INTERRUPT_HALT) > > + && replay_interrupt()) { > > cpu->interrupt_request &= ~CPU_INTERRUPT_HALT; > > cpu->halted = 1; > > cpu->exception_index = EXCP_HLT; > > cpu_loop_exit(cpu); > > } > > #if defined(TARGET_I386) > > - if (interrupt_request & CPU_INTERRUPT_INIT) { > > + if ((interrupt_request & CPU_INTERRUPT_INIT) > > + && replay_interrupt()) { > > cpu_svm_check_intercept_param(env, SVM_EXIT_INIT, 0); > > do_cpu_init(x86_cpu); > > cpu->exception_index = EXCP_HALTED; > > cpu_loop_exit(cpu); > > } > > #else > > - if (interrupt_request & CPU_INTERRUPT_RESET) { > > + if ((interrupt_request & CPU_INTERRUPT_RESET) > > + && replay_interrupt()) { > > cpu_reset(cpu); > > } > > #endif > > Perhaps check the replay_interrupt() outside, in an && with "if > (unlikely(interrupt_request))"? You mean that I should wrap whole condition into "unlikely"? > > @@ -441,7 +459,10 @@ int cpu_exec(CPUArchState *env) > > False when the interrupt isn't processed, > > True when it is, and we should restart on a new TB, > > and via longjmp via cpu_loop_exit. */ > > - if (cc->cpu_exec_interrupt(cpu, interrupt_request)) { > > + if ((replay_mode != REPLAY_MODE_PLAY > > + || replay_has_interrupt()) > > + && cc->cpu_exec_interrupt(cpu, interrupt_request)) { > > + replay_interrupt(); > > Please put this in a separate function like: > > if (replay_mode == REPLAY_MODE_PLAY && !replay_has_interrupt()) { > return false; > } > ret = cc->cpu_exec_interrupt(cpu, interrupt_request); > if (ret) { > replay_interrupt(); > } > return ret; Ok. Pavel Dovgalyuk