From nobody Fri Nov 14 21:07:16 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761224886; cv=none; d=zohomail.com; s=zohoarc; b=QfBjtL6OMFH6vH/df8daFWGigLVp7WZz4cXNANoWE448HL9/cmkMuUKoD8Qwv4ZCXwBACy6KfAegplz8byw3aUdLmvMOlB8BtGQCOidx7KGMX+nSv1PN07gDxOjnq7TW43FK614gnMI6BXltWZxQIUxrbxr40VeVAZBdI3X9B6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761224886; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=POy1R+so3EVlSCdkiJjnl33gOSzhKoIaueGiZB1q9Rk=; b=ajKvdbPIi3Swp6TuPcnMpOFl7pDOwrPy5Plpn6GasL3DDa8Z+AHm065JYqLU5Xy/ktFlMqaNgO8G5xChbYPj2nqwTravUsAh/s8lJBNIJywqzudyKnZ7Y/niiAUhDqk1o+xrVteXa3EdgzjuXedchYOq6xyQSO5KAmSEYrUHZew= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176122488668422.38679255592251; Thu, 23 Oct 2025 06:08:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBv1o-0001RJ-Hc; Thu, 23 Oct 2025 09:06:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vBv1k-0001QN-JS for qemu-devel@nongnu.org; Thu, 23 Oct 2025 09:06:48 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBv1h-0006Ie-MK for qemu-devel@nongnu.org; Thu, 23 Oct 2025 09:06:47 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3f2cf786abeso634652f8f.3 for ; Thu, 23 Oct 2025 06:06:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429897f546asm3854191f8f.15.2025.10.23.06.06.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 23 Oct 2025 06:06:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761224803; x=1761829603; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=POy1R+so3EVlSCdkiJjnl33gOSzhKoIaueGiZB1q9Rk=; b=o7JlLGFNtwKF9aAqUU75hRp4LgMMAu4epbaiQfDKSivwbxYmZWTlL2gJylknDcyYoT mIfwpbL3jcbjvE/6cYAltnyG/nEfwrhtzsJDVCBUX+L0HQNAzuhhfAHwjYpZJREWkpjv 9V+Mj0ZjpTjMm4oyvD/hzGkFPptL2ngWYFC67vuQOKhktB2hSEnwVIWJZHKWe73RLz0+ ziuTDBRc12ULmP7cR6xuFuhs0Fw18v1mp9m0/S0YcUv1lvg6wfu9xha+0Uj7xpYqGHg3 uCyBgQAZwPy3icRgzpxA+dfAjEura8TEfosmBR2YSGQ3lTD4GLpG6JnlnBSrHl+xYqpY tffg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761224803; x=1761829603; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=POy1R+so3EVlSCdkiJjnl33gOSzhKoIaueGiZB1q9Rk=; b=tiEZ2dn7YhlZsvvFau0QvqwDTorbhWZ6m3whsTq1a36Poygs+3uRCwDtpEFnS2MDds 4D/xXhohOIzCl6yoysWNGCK2iZPL1j35Dz9A6DciRiVB+OK/SKb7dlvdNYNiyMlPYD0U QPOiANaKpE/DAzyrBcs02I0zETVJX1N6IorSTPYVaChcm5aepTOvRk0xodZglefsE4y9 NHr1NMlogbLfqfZIY9qyKOfHuFF1TZVt2R1K+XnYS5zt0DRx6rYfppbwN1O8DCIk7gYz 0QIGs2p0dY2KiEThh5pkdAApmEE7vjy+VFs7F7rRODyBa12gdJjEH/GrIFVxA9PTurG4 yPkg== X-Gm-Message-State: AOJu0Yx6OSdZLZ3r5Is3zhM3KeL/jn1dyCHH8AFnDTdXgtIiHg4w31JP 8FFyPZPUoZqZoRluUNQcIbfLOxenzCX45++Md8dQw9KktrNfR0tVAEe+WFdc2sCpSZqGFsAMNW/ fTnmpwVw= X-Gm-Gg: ASbGnctSdiXtvffyPzeY5DyWW8Kw1xdbSWmFaqLqhyL+hWaGSVQZKDocA1yt1IBw12e ZfomnCAz7fk+aM1k01vK9p5L3Y278epAhFId/n9akbnVVv5YH/W7pLblwu4YsPP0/9osS/eoTky tWxZmdnILDh3WXZaA9lqJ8bKeTx3L3+UktZDFOOsjdUD9lLlAvdsmqtflX0ZH5mh6FKBxxxeQ1y nfYcTlDxcXrMxAZAO0g7xEMHRFZLIeVQHmjnh2duPzumL0FAh7trDNwCcKd88xoD8OAHjxxK98k sZV8OatJEE2S6E9Rj16vn2K++EZb9yXK+UBl6c6o/RQbbsfmzDJ5YvM1qTo6UIDuZpSuGVTZaFT 60lUHh08Yt8DchwPeTdOMaYsCL/3gRpI0A+UjQiVG6wSmQ+BePBp2fLjUONAbXDii7X0QvpvwF0 poUkF97ZcPKOgkczv9rrM88ylG8qgTvmBvcL2oeN348kbYmYRKk0TaXOP4DOze X-Google-Smtp-Source: AGHT+IGwcgvDAlOJgBsVjkItwcjVZEn6dZgi4Cx++mTBncBTEJ6K72xgApGncveQ2KKXRQO6+GOShA== X-Received: by 2002:a05:6000:609:b0:429:8d21:5729 with SMTP id ffacd0b85a97d-4298d2157cemr187432f8f.49.1761224803035; Thu, 23 Oct 2025 06:06:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Mohamed Mediouni , Stefan Hajnoczi , Alexander Graf , Peter Collingbourne , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , qemu-arm@nongnu.org, Mads Ynddal , Phil Dennis-Jordan , Peter Maydell , Roman Bolshakov Subject: [PATCH v2 45/58] accel/hvf: Implement WFI without using pselect() Date: Thu, 23 Oct 2025 15:06:21 +0200 Message-ID: <20251023130625.9157-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251023114638.5667-1-philmd@linaro.org> References: <20251023114638.5667-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1761224889663154100 Return to the main loop where we'll be waken again. This avoid a tricky race with signals introduced in commit 219c101fa7f ("Add HVF WFI handler"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/system/hvf_int.h | 1 - accel/hvf/hvf-accel-ops.c | 5 +-- target/arm/hvf/hvf.c | 76 ++++----------------------------------- 3 files changed, 9 insertions(+), 73 deletions(-) diff --git a/include/system/hvf_int.h b/include/system/hvf_int.h index d842d4b2b99..c8e407a1463 100644 --- a/include/system/hvf_int.h +++ b/include/system/hvf_int.h @@ -47,7 +47,6 @@ struct AccelCPUState { #ifdef __aarch64__ hv_vcpu_exit_t *exit; bool vtimer_masked; - sigset_t unblock_ipi_mask; bool guest_debug_enabled; #endif }; diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index bbb0b385fe9..e9dd2d24745 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -128,14 +128,15 @@ static int hvf_init_vcpu(CPUState *cpu) cpu->accel =3D g_new0(AccelCPUState, 1); =20 /* init cpu signals */ + sigset_t unblock_ipi_mask; struct sigaction sigact; =20 memset(&sigact, 0, sizeof(sigact)); sigact.sa_handler =3D dummy_signal; sigaction(SIG_IPI, &sigact, NULL); =20 - pthread_sigmask(SIG_BLOCK, NULL, &cpu->accel->unblock_ipi_mask); - sigdelset(&cpu->accel->unblock_ipi_mask, SIG_IPI); + pthread_sigmask(SIG_BLOCK, NULL, &unblock_ipi_mask); + sigdelset(&unblock_ipi_mask, SIG_IPI); =20 #ifdef __aarch64__ r =3D hv_vcpu_create(&cpu->accel->fd, diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 8c2eac6738f..d3d05b0ccba 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -302,7 +302,7 @@ void hvf_arm_init_debug(void) #define TMR_CTL_IMASK (1 << 1) #define TMR_CTL_ISTATUS (1 << 2) =20 -static void hvf_wfi(CPUState *cpu); +static int hvf_wfi(CPUState *cpu); =20 static uint32_t chosen_ipa_bit_size; =20 @@ -1715,85 +1715,21 @@ static uint64_t hvf_vtimer_val_raw(void) return mach_absolute_time() - hvf_state->vtimer_offset; } =20 -static uint64_t hvf_vtimer_val(void) +static int hvf_wfi(CPUState *cpu) { - if (!runstate_is_running()) { - /* VM is paused, the vtimer value is in vtimer.vtimer_val */ - return vtimer.vtimer_val; - } - - return hvf_vtimer_val_raw(); -} - -static void hvf_wait_for_ipi(CPUState *cpu, struct timespec *ts) -{ - /* - * Use pselect to sleep so that other threads can IPI us while we're - * sleeping. - */ - qatomic_set_mb(&cpu->thread_kicked, false); - bql_unlock(); - pselect(0, 0, 0, 0, ts, &cpu->accel->unblock_ipi_mask); - bql_lock(); -} - -static void hvf_wfi(CPUState *cpu) -{ - ARMCPU *arm_cpu =3D ARM_CPU(cpu); - struct timespec ts; - hv_return_t r; - uint64_t ctl; - uint64_t cval; - int64_t ticks_to_sleep; - uint64_t seconds; - uint64_t nanos; - uint32_t cntfrq; - if (cpu_has_work(cpu)) { /* Don't bother to go into our "low power state" if * we would just wake up immediately. */ - return; + return 0; } =20 if (cpu_test_interrupt(cpu, CPU_INTERRUPT_HARD | CPU_INTERRUPT_FIQ)) { /* Interrupt pending, no need to wait */ - return; + return EXCP_INTERRUPT; } =20 - r =3D hv_vcpu_get_sys_reg(cpu->accel->fd, HV_SYS_REG_CNTV_CTL_EL0, &ct= l); - assert_hvf_ok(r); - - if (!(ctl & 1) || (ctl & 2)) { - /* Timer disabled or masked, just wait for an IPI. */ - hvf_wait_for_ipi(cpu, NULL); - return; - } - - r =3D hv_vcpu_get_sys_reg(cpu->accel->fd, HV_SYS_REG_CNTV_CVAL_EL0, &c= val); - assert_hvf_ok(r); - - ticks_to_sleep =3D cval - hvf_vtimer_val(); - if (ticks_to_sleep < 0) { - return; - } - - cntfrq =3D gt_cntfrq_period_ns(arm_cpu); - seconds =3D muldiv64(ticks_to_sleep, cntfrq, NANOSECONDS_PER_SECOND); - ticks_to_sleep -=3D muldiv64(seconds, NANOSECONDS_PER_SECOND, cntfrq); - nanos =3D ticks_to_sleep * cntfrq; - - /* - * Don't sleep for less than the time a context switch would take, - * so that we can satisfy fast timer requests on the same CPU. - * Measurements on M1 show the sweet spot to be ~2ms. - */ - if (!seconds && nanos < (2 * SCALE_MS)) { - return; - } - - ts =3D (struct timespec) { seconds, nanos }; - hvf_wait_for_ipi(cpu, &ts); + return EXCP_HLT; } =20 /* Must be called by the owning thread */ @@ -1982,7 +1918,7 @@ static int hvf_handle_exception(CPUState *cpu, hv_vcp= u_exit_exception_t *excp) case EC_WFX_TRAP: advance_pc =3D true; if (!(syndrome & WFX_IS_WFE)) { - hvf_wfi(cpu); + ret =3D hvf_wfi(cpu); } break; case EC_AA64_HVC: --=20 2.51.0