From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D15E7CD98C3 for ; Mon, 8 Jun 2026 14:43:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+fDLbVP0/03vtAk24J0g4xFUhXqAHm7ngLBbxS1NlMc=; b=mW5QJbT4ts/Mms /0QIX0cHcmLc49OtRSGivwc0EdBCaAzrbONMIAm/Pkzxqnn47c5dcSu4Rvkp/GRRgyRbn2xDb4PvE vmjl7WbY+s/6Uh3DiD1hwVOn5eg6jogVjvtZf0Qi/LuYDzBk7Utms54C/iuTz77kT3t4RWfkt0ROz XzH4Q2zukUICwgXMXkTg5ZczWuXtIvJrJ6VjWf3GpGgQxsgc2dNRODGF9nzc2MpOLo99RR74kkmj9 eXndgEWJm9VoDbU+ukFz7PZhxlQZK+SaUWSTRdPSR19pY4zSCUMa3o82BS3QNsOMDtWD/0MdyF+zz K9OSDSng7Y9IIQ1cqKGw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wWbCI-00000003pvH-0reF; Mon, 08 Jun 2026 14:43:26 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wWbCC-00000003piB-2PVu for kvm-riscv@bombadil.infradead.org; Mon, 08 Jun 2026 14:43:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=hNQP7/EdSG3cCeW6Faawmy/E0oUQJiBDgFzOTeJqXM8=; b=c4n9zD15KQiRR5N2EBMcq0CoSG ONjYKgmIswOsVkN5pWFvHrbDNHnSpa5FAX+Jbbl0RMwEDxUxf2k0cK5KmKRga9+zttLySgweYcBtb FroOtyUeOMvvjA6exOysU3xon7wUu2Kb/xlLKcB414sXfdeDS/O9wCYpjwzuDMfF8t1dVLZVwBay3 Qfrci3MVXVji2fzsVzwRF0KOfMAM/Ta/+W130Y3U+omfZ3084UiQuyWzm0pmYJlmu51CLbqYt8NnW /mV1KmujlIKA2lytQa0gq9yYUz649G3GhNAg5oX4AlZM27fj8HP6QiFur74LbAqxnHxe4KTVukvKe O04Gu3rA==; Received: from mail.8bytes.org ([2a01:238:42d9:3f00:e505:6202:4f0c:f051]) by desiato.infradead.org with esmtp (Exim 4.99.2 #2 (Red Hat Linux)) id 1wWbC7-0000000198z-2xFl for kvm-riscv@lists.infradead.org; Mon, 08 Jun 2026 14:43:18 +0000 Received: from io.home.8bytes.org (p4ffe1d30.dip0.t-ipconnect.de [79.254.29.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.8bytes.org (Postfix) with ESMTPSA id 337162028BB; Mon, 8 Jun 2026 16:43:10 +0200 (CEST) From: =?UTF-8?q?J=C3=B6rg=20R=C3=B6del?= To: Paolo Bonzini , Sean Christopherson Cc: Tom Lendacky , ashish.kalra@amd.com, michael.roth@amd.com, nsaenz@amazon.com, anelkz@amazon.de, James.Bottomley@HansenPartnership.com, Melody Wang , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, x86@kernel.org, coconut-svsm@lists.linux.dev, joerg.roedel@amd.com Subject: [PATCH 24/60] kvm: Move kvm_vcpu spinloop members to struct kvm_vcpu_common Date: Mon, 8 Jun 2026 16:42:16 +0200 Message-ID: <20260608144252.351443-25-joro@8bytes.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260608144252.351443-1-joro@8bytes.org> References: <20260608144252.351443-1-joro@8bytes.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260608_154316_026295_21AF4830 X-CRM114-Status: GOOD ( 18.90 ) X-BeenThere: kvm-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kvm-riscv" Errors-To: kvm-riscv-bounces+kvm-riscv=archiver.kernel.org@lists.infradead.org From: Joerg Roedel Onlyh one struct kvm_vcpu across all planes can be in a spin-loop. Move the state to struct kvm_vcpu_common to make detection independent of the active struct kvm_vcpu. Signed-off-by: Joerg Roedel --- include/linux/kvm_host.h | 32 +++++++++++++++---------------- virt/kvm/kvm_main.c | 41 ++++++++++++++++++++++------------------ 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 9220c452aa3a..f6e8a0b653b3 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -350,6 +350,20 @@ struct kvm_vcpu_common { rwlock_t pid_lock; int sigset_active; sigset_t sigset; + unsigned int halt_poll_ns; + +#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT + /* + * Cpu relax intercept or pause loop exit optimization + * in_spin_loop: set when a vcpu does a pause loop exit + * or cpu relax intercepted. + * dy_eligible: indicates whether vcpu is eligible for directed yield. + */ + struct { + bool in_spin_loop; + bool dy_eligible; + } spin_loop; +#endif /* Scheduling state */ #ifdef CONFIG_PREEMPT_NOTIFIERS @@ -373,8 +387,6 @@ struct kvm_vcpu { struct kvm_run *run; - unsigned int halt_poll_ns; - u64 plane_requests; /* S390 only */ @@ -398,18 +410,6 @@ struct kvm_vcpu { } async_pf; #endif -#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT - /* - * Cpu relax intercept or pause loop exit optimization - * in_spin_loop: set when a vcpu does a pause loop exit - * or cpu relax intercepted. - * dy_eligible: indicates whether vcpu is eligible for directed yield. - */ - struct { - bool in_spin_loop; - bool dy_eligible; - } spin_loop; -#endif struct kvm_vcpu_arch arch; struct kvm_vcpu_stat stat; char stats_id[KVM_STATS_NAME_SIZE]; @@ -2500,11 +2500,11 @@ extern struct kvm_device_ops kvm_arm_vgic_v5_ops; static inline void kvm_vcpu_set_in_spin_loop(struct kvm_vcpu *vcpu, bool val) { - vcpu->spin_loop.in_spin_loop = val; + vcpu->common->spin_loop.in_spin_loop = val; } static inline void kvm_vcpu_set_dy_eligible(struct kvm_vcpu *vcpu, bool val) { - vcpu->spin_loop.dy_eligible = val; + vcpu->common->spin_loop.dy_eligible = val; } #else /* !CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT */ diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 1858880ee3d3..24ff8748a317 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -485,6 +485,9 @@ static int kvm_vcpu_init_common(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned vcpu->common = no_free_ptr(common); + kvm_vcpu_set_in_spin_loop(vcpu, false); + kvm_vcpu_set_dy_eligible(vcpu, false); + return 0; out_drop_counter: @@ -515,8 +518,6 @@ static void kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id) vcpu->vcpu_id = id; kvm_async_pf_vcpu_init(vcpu); - kvm_vcpu_set_in_spin_loop(vcpu, false); - kvm_vcpu_set_dy_eligible(vcpu, false); vcpu->last_used_slot = NULL; vcpu->plane_level = 0; @@ -3721,9 +3722,10 @@ void kvm_sigset_deactivate(struct kvm_vcpu *vcpu) static void grow_halt_poll_ns(struct kvm_vcpu *vcpu) { + struct kvm_vcpu_common *common = vcpu->common; unsigned int old, val, grow, grow_start; - old = val = vcpu->halt_poll_ns; + old = val = common->halt_poll_ns; grow_start = READ_ONCE(halt_poll_ns_grow_start); grow = READ_ONCE(halt_poll_ns_grow); if (!grow) @@ -3733,16 +3735,17 @@ static void grow_halt_poll_ns(struct kvm_vcpu *vcpu) if (val < grow_start) val = grow_start; - vcpu->halt_poll_ns = val; + common->halt_poll_ns = val; out: trace_kvm_halt_poll_ns_grow(vcpu->vcpu_id, val, old); } static void shrink_halt_poll_ns(struct kvm_vcpu *vcpu) { + struct kvm_vcpu_common *common = vcpu->common; unsigned int old, val, shrink, grow_start; - old = val = vcpu->halt_poll_ns; + old = val = common->halt_poll_ns; shrink = READ_ONCE(halt_poll_ns_shrink); grow_start = READ_ONCE(halt_poll_ns_grow_start); if (shrink == 0) @@ -3753,7 +3756,7 @@ static void shrink_halt_poll_ns(struct kvm_vcpu *vcpu) if (val < grow_start) val = 0; - vcpu->halt_poll_ns = val; + common->halt_poll_ns = val; trace_kvm_halt_poll_ns_shrink(vcpu->vcpu_id, val, old); } @@ -3864,19 +3867,20 @@ void kvm_vcpu_halt(struct kvm_vcpu *vcpu) { unsigned int max_halt_poll_ns = kvm_vcpu_max_halt_poll_ns(vcpu); bool halt_poll_allowed = !kvm_arch_no_poll(vcpu); + struct kvm_vcpu_common *common = vcpu->common; ktime_t start, cur, poll_end; bool waited = false; bool do_halt_poll; u64 halt_ns; - if (vcpu->halt_poll_ns > max_halt_poll_ns) - vcpu->halt_poll_ns = max_halt_poll_ns; + if (common->halt_poll_ns > max_halt_poll_ns) + common->halt_poll_ns = max_halt_poll_ns; - do_halt_poll = halt_poll_allowed && vcpu->halt_poll_ns; + do_halt_poll = halt_poll_allowed && common->halt_poll_ns; start = cur = poll_end = ktime_get(); if (do_halt_poll) { - ktime_t stop = ktime_add_ns(start, vcpu->halt_poll_ns); + ktime_t stop = ktime_add_ns(start, common->halt_poll_ns); do { if (kvm_vcpu_check_block(vcpu) < 0) @@ -3914,18 +3918,18 @@ void kvm_vcpu_halt(struct kvm_vcpu *vcpu) if (!vcpu_valid_wakeup(vcpu)) { shrink_halt_poll_ns(vcpu); } else if (max_halt_poll_ns) { - if (halt_ns <= vcpu->halt_poll_ns) + if (halt_ns <= common->halt_poll_ns) ; /* we had a long block, shrink polling */ - else if (vcpu->halt_poll_ns && + else if (common->halt_poll_ns && halt_ns > max_halt_poll_ns) shrink_halt_poll_ns(vcpu); /* we had a short halt and our poll time is too small */ - else if (vcpu->halt_poll_ns < max_halt_poll_ns && + else if (common->halt_poll_ns < max_halt_poll_ns && halt_ns < max_halt_poll_ns) grow_halt_poll_ns(vcpu); } else { - vcpu->halt_poll_ns = 0; + common->halt_poll_ns = 0; } } @@ -4046,13 +4050,14 @@ EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_vcpu_yield_to); static bool kvm_vcpu_eligible_for_directed_yield(struct kvm_vcpu *vcpu) { #ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT + struct kvm_vcpu_common *common = vcpu->common; bool eligible; - eligible = !vcpu->spin_loop.in_spin_loop || - vcpu->spin_loop.dy_eligible; + eligible = !common->spin_loop.in_spin_loop || + common->spin_loop.dy_eligible; - if (vcpu->spin_loop.in_spin_loop) - kvm_vcpu_set_dy_eligible(vcpu, !vcpu->spin_loop.dy_eligible); + if (common->spin_loop.in_spin_loop) + kvm_vcpu_set_dy_eligible(vcpu, !common->spin_loop.dy_eligible); return eligible; #else -- 2.53.0 -- kvm-riscv mailing list kvm-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kvm-riscv