From nobody Wed Nov 5 20:14:41 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153720262652422.39135163113815; Mon, 17 Sep 2018 09:43:46 -0700 (PDT) Received: from localhost ([::1]:36498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1wce-00081K-It for importer@patchew.org; Mon, 17 Sep 2018 12:43:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1wQo-0006Ql-RY for qemu-devel@nongnu.org; Mon, 17 Sep 2018 12:31:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g1wQk-00027P-H2 for qemu-devel@nongnu.org; Mon, 17 Sep 2018 12:31:26 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:51257) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g1wQk-0001oQ-4W for qemu-devel@nongnu.org; Mon, 17 Sep 2018 12:31:22 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 450D7532; Mon, 17 Sep 2018 12:31:08 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 17 Sep 2018 12:31:08 -0400 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 77771E49C5; Mon, 17 Sep 2018 12:31:07 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=U6zrKwsml3kRM+ sHAHK8IYvaKDshpBeSaAPubp6v8GE=; b=1e4NqkKXsxTB1aTf2pCePpRiDnKNks uswP+ZCKoHmaGtGoYAU6eSESFC0OggtCL0H5f1vk3YjlhOpD8NUBYKcDysmUgY1W XpvtvTxtRgZ2CK7Ynd5FVvYQdbSGSe0HUCfMY0R6GBijw/g+m59lhYfMIkwutTH7 w1cIJdGhr6Cq0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=U6zrKwsml3kRM+sHAHK8IYvaKDshpBeSaAPubp6v8GE=; b=BZwnsInE wkBfPirBhuRYUVOjBlSosYAUMUzSnAqRW9KXjM15r/DhhCcUKOuS51J64w91fUAX vguQxKziUoPDxIGjZE1RwUimv9Q0a21qb/WxrOIh+aAQmHJhH33DX+zY87QMGb1s xpfMk+7lThChKJ6briOiyqCaObh2gO+/dKJO0gsEjLuSMlqdsPO1jdcBdJc9aIO7 I2hBXBvgHmC4lb/qYdNoVvuxuFf8n5gI6CxfofWQuQKwHC5l7LhayPJfus4j29y2 bto/XI1XYlUCZrem6LgRhlhj7l4saP8IEa3aC+K2lAZLU+SaLsqpPLG9ZCWKSVkM 8hzkJB79dEW1Xw== X-ME-Proxy: X-ME-Sender: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Mon, 17 Sep 2018 12:30:41 -0400 Message-Id: <20180917163103.6113-14-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180917163103.6113-1-cota@braap.org> References: <20180917163103.6113-1-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 64.147.123.25 Subject: [Qemu-devel] [PATCH 13/35] hvf: access cpu->interrupt_request with atomics 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: Paolo Bonzini , Eduardo Habkost , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" I am not familiar with hvf, so I opted for the safe (and slow) route of performing probably many unnecessary atomic_reads. Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Emilio G. Cota --- target/i386/hvf/hvf.c | 7 ++++--- target/i386/hvf/x86hvf.c | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index df69e6d0a7..9c49d3c318 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -251,7 +251,7 @@ void update_apic_tpr(CPUState *cpu) =20 static void hvf_handle_interrupt(CPUState * cpu, int mask) { - cpu->interrupt_request |=3D mask; + atomic_or(&cpu->interrupt_request, mask); if (!qemu_cpu_is_self(cpu)) { qemu_cpu_kick(cpu); } @@ -713,10 +713,11 @@ int hvf_vcpu_exec(CPUState *cpu) ret =3D 0; switch (exit_reason) { case EXIT_REASON_HLT: { + int interrupt_request =3D atomic_read(&cpu->interrupt_request); macvm_set_rip(cpu, rip + ins_len); - if (!((cpu->interrupt_request & CPU_INTERRUPT_HARD) && + if (!((interrupt_request & CPU_INTERRUPT_HARD) && (EFLAGS(env) & IF_MASK)) - && !(cpu->interrupt_request & CPU_INTERRUPT_NMI) && + && !(interrupt_request & CPU_INTERRUPT_NMI) && !(idtvec_info & VMCS_IDT_VEC_VALID)) { cpu->halted =3D 1; ret =3D EXCP_HLT; diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c index 3ac796b885..878714b99c 100644 --- a/target/i386/hvf/x86hvf.c +++ b/target/i386/hvf/x86hvf.c @@ -400,7 +400,7 @@ bool hvf_inject_interrupts(CPUState *cpu_state) }; } =20 - if (cpu_state->interrupt_request & CPU_INTERRUPT_NMI) { + if (atomic_read(&cpu_state->interrupt_request) & CPU_INTERRUPT_NMI) { if (!(env->hflags2 & HF2_NMI_MASK) && !(info & VMCS_INTR_VALID)) { cpu_reset_interrupt(cpu_state, CPU_INTERRUPT_NMI); info =3D VMCS_INTR_VALID | VMCS_INTR_T_NMI | NMI_VEC; @@ -411,7 +411,7 @@ bool hvf_inject_interrupts(CPUState *cpu_state) } =20 if (!(env->hflags & HF_INHIBIT_IRQ_MASK) && - (cpu_state->interrupt_request & CPU_INTERRUPT_HARD) && + (atomic_read(&cpu_state->interrupt_request) & CPU_INTERRUPT_HARD) = && (EFLAGS(env) & IF_MASK) && !(info & VMCS_INTR_VALID)) { int line =3D cpu_get_pic_interrupt(&x86cpu->env); cpu_reset_interrupt(cpu_state, CPU_INTERRUPT_HARD); @@ -420,11 +420,11 @@ bool hvf_inject_interrupts(CPUState *cpu_state) VMCS_INTR_VALID | VMCS_INTR_T_HWINTR); } } - if (cpu_state->interrupt_request & CPU_INTERRUPT_HARD) { + if (atomic_read(&cpu_state->interrupt_request) & CPU_INTERRUPT_HARD) { vmx_set_int_window_exiting(cpu_state); } - return (cpu_state->interrupt_request - & (CPU_INTERRUPT_INIT | CPU_INTERRUPT_TPR)); + return atomic_read(&cpu_state->interrupt_request) + & (CPU_INTERRUPT_INIT | CPU_INTERRUPT_TPR); } =20 int hvf_process_events(CPUState *cpu_state) @@ -434,25 +434,25 @@ int hvf_process_events(CPUState *cpu_state) =20 EFLAGS(env) =3D rreg(cpu_state->hvf_fd, HV_X86_RFLAGS); =20 - if (cpu_state->interrupt_request & CPU_INTERRUPT_INIT) { + if (atomic_read(&cpu_state->interrupt_request) & CPU_INTERRUPT_INIT) { hvf_cpu_synchronize_state(cpu_state); do_cpu_init(cpu); } =20 - if (cpu_state->interrupt_request & CPU_INTERRUPT_POLL) { + if (atomic_read(&cpu_state->interrupt_request) & CPU_INTERRUPT_POLL) { cpu_reset_interrupt(cpu_state, CPU_INTERRUPT_POLL); apic_poll_irq(cpu->apic_state); } - if (((cpu_state->interrupt_request & CPU_INTERRUPT_HARD) && + if (((atomic_read(&cpu_state->interrupt_request) & CPU_INTERRUPT_HARD)= && (EFLAGS(env) & IF_MASK)) || - (cpu_state->interrupt_request & CPU_INTERRUPT_NMI)) { + (atomic_read(&cpu_state->interrupt_request) & CPU_INTERRUPT_NMI)) { cpu_state->halted =3D 0; } - if (cpu_state->interrupt_request & CPU_INTERRUPT_SIPI) { + if (atomic_read(&cpu_state->interrupt_request) & CPU_INTERRUPT_SIPI) { hvf_cpu_synchronize_state(cpu_state); do_cpu_sipi(cpu); } - if (cpu_state->interrupt_request & CPU_INTERRUPT_TPR) { + if (atomic_read(&cpu_state->interrupt_request) & CPU_INTERRUPT_TPR) { cpu_reset_interrupt(cpu_state, CPU_INTERRUPT_TPR); hvf_cpu_synchronize_state(cpu_state); apic_handle_tpr_access_report(cpu->apic_state, env->eip, --=20 2.17.1