From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 19BBE15B99D for ; Sat, 9 Nov 2024 11:39:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731152358; cv=none; b=a3Nxs6f+I9SvXv2dxI5Qy58q6qsos5lYB8PhGXGv7e7+v4J9gZRitz6zU4OFCvDAw6k/C3c4QlfPACKuMT2B2JOcyC7/agFQ4wQnh7heKxJ+dzF9mwGnH5SYGVUk0Hi+ZEYBJW6LTKvew0ONd2RDgHX4F9N7QuXTIw1smaA0/6w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731152358; c=relaxed/simple; bh=9C6wmKbdkMEODrhrzMJfQSzA+27ApMwteIoNP5uCXx4=; h=Date:Message-ID:From:To:Cc:Subject:In-Reply-To:References: MIME-Version:Content-Type; b=k/U2hmnwKLMa5zWCmKpxfaA33NwLullSU0qEl9tLTFJBySNCOXhvGYDqZyD3oLaA0Zg1FqbN8Zz0xOm2zBwQnQ59T6Rb0SB0S3g4jDGPKQaEx6zHR31zyH4IehLWDry60+ywPfdqjG+skXxLrqGYFKYm3VCfqnFFwVJzQoCQk1s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OwwmVnoE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OwwmVnoE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF1D4C4CECE; Sat, 9 Nov 2024 11:39:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731152358; bh=9C6wmKbdkMEODrhrzMJfQSzA+27ApMwteIoNP5uCXx4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=OwwmVnoEUwfT3h0EfQ7z7zViKno8kC7mcUo89ZGsXALT8vUtEt/gJVR1024OuzTxc 8BMnoOdC1Zoqq7TIMfQoN7RO7BS0wWIHPppXAmn9P0jZWIDfdmRf5JjJZiNACnJdlt 0qul4LbdAjpkPYK2BSmmrY2pD60a3e3hsqE2Y5spu1oBmXjr67rXjQN2ENsx2lzAZa D/koQFuyn2HR363il6ouY4rv4T5B+U6UawwpdnIMO+dzqdcpSUaK12tA2OqVymRC/p KbwI0QfkCs4sKar3dqjuAMHFl1yLyFkmSgR61FHziY9NMiBeGDVV5o1pbfGCwiHYUa DMihKZEFmrlQg== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1t9joB-00BPMV-N1; Sat, 09 Nov 2024 11:39:15 +0000 Date: Sat, 09 Nov 2024 11:39:15 +0000 Message-ID: <864j4g1vrw.wl-maz@kernel.org> From: Marc Zyngier To: Oliver Upton Cc: kvmarm@lists.linux.dev, Joey Gouly , Suzuki K Poulose , Zenghui Yu , Mingwei Zhang , Colton Lewis , Alexandru Elisei Subject: Re: [PATCH 04/15] KVM: arm64: Move host SME/SVE tracking flags to host data In-Reply-To: <20241108222418.1677420-5-oliver.upton@linux.dev> References: <20241108222418.1677420-1-oliver.upton@linux.dev> <20241108222418.1677420-5-oliver.upton@linux.dev> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/29.4 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: oliver.upton@linux.dev, kvmarm@lists.linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, mizhang@google.com, coltonlewis@google.com, alexandru.elisei@arm.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false On Fri, 08 Nov 2024 22:24:08 +0000, Oliver Upton wrote: > > The SME/SVE state tracking flags have no business in the vCPU. Move them > to kvm_host_data. > > Signed-off-by: Oliver Upton > --- > arch/arm64/include/asm/kvm_host.h | 25 ++++++++++++------------- > arch/arm64/kvm/fpsimd.c | 12 ++++++------ > 2 files changed, 18 insertions(+), 19 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 07da4129f1d1..cf5cdc468aa4 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -610,8 +610,10 @@ struct cpu_sve_state { > * field. > */ > struct kvm_host_data { > -#define KVM_HOST_DATA_FLAG_HAS_SPE 0 > -#define KVM_HOST_DATA_FLAG_HAS_TRBE 1 > +#define KVM_HOST_DATA_FLAG_HAS_SPE 0 > +#define KVM_HOST_DATA_FLAG_HAS_TRBE 1 > +#define KVM_HOST_DATA_FLAG_HOST_SVE_ENABLED 2 > +#define KVM_HOST_DATA_FLAG_HOST_SME_ENABLED 3 > unsigned long flags; > > struct kvm_cpu_context host_ctxt; > @@ -916,22 +918,18 @@ struct kvm_vcpu_arch { > /* Guest debug is live */ > #define DEBUG_DIRTY __vcpu_single_flag(iflags, BIT(4)) > > -/* SVE enabled for host EL0 */ > -#define HOST_SVE_ENABLED __vcpu_single_flag(sflags, BIT(0)) > -/* SME enabled for EL0 */ > -#define HOST_SME_ENABLED __vcpu_single_flag(sflags, BIT(1)) > /* Physical CPU not in supported_cpus */ > -#define ON_UNSUPPORTED_CPU __vcpu_single_flag(sflags, BIT(2)) > +#define ON_UNSUPPORTED_CPU __vcpu_single_flag(sflags, BIT(0)) > /* WFIT instruction trapped */ > -#define IN_WFIT __vcpu_single_flag(sflags, BIT(3)) > +#define IN_WFIT __vcpu_single_flag(sflags, BIT(1)) > /* vcpu system registers loaded on physical CPU */ > -#define SYSREGS_ON_CPU __vcpu_single_flag(sflags, BIT(4)) > +#define SYSREGS_ON_CPU __vcpu_single_flag(sflags, BIT(2)) > /* Software step state is Active-pending */ > -#define DBG_SS_ACTIVE_PENDING __vcpu_single_flag(sflags, BIT(5)) > +#define DBG_SS_ACTIVE_PENDING __vcpu_single_flag(sflags, BIT(3)) > /* PMUSERENR for the guest EL0 is on physical CPU */ > -#define PMUSERENR_ON_CPU __vcpu_single_flag(sflags, BIT(6)) > +#define PMUSERENR_ON_CPU __vcpu_single_flag(sflags, BIT(4)) > /* WFI instruction trapped */ > -#define IN_WFI __vcpu_single_flag(sflags, BIT(7)) > +#define IN_WFI __vcpu_single_flag(sflags, BIT(5)) > > > /* Pointer to the vcpu's SVE FFR for sve_{save,load}_state() */ > @@ -1314,7 +1312,8 @@ DECLARE_KVM_HYP_PER_CPU(struct kvm_host_data, kvm_host_data); > (test_bit(KVM_HOST_DATA_FLAG_##flag, host_data_ptr(flags))) > #define host_data_set_flag(flag) \ > (set_bit(KVM_HOST_DATA_FLAG_##flag, host_data_ptr(flags))) > - > +#define host_data_clear_flag(flag) \ > + (clear_bit(KVM_HOST_DATA_FLAG_##flag, host_data_ptr(flags))) nit: move the flag-clearing primitive to the patch that introduces the two others for consistency, and drop the brackets surrounding the set/clear statements. Otherwise, this is a pretty nice cleanup. M. -- Without deviation from the norm, progress is not possible.