From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.167.199 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795114352; b=mGku8wnkFaMpw1YFbQsRTWOiklS3tfx49BhLzdiqy0No5tNSny1uM2y+Fegrj5ebA3/T HXt9IRaWS8vC0xz9Tj/YmdRvXNs8qvDd6zRQ6SjAfpK9OyRS24qrmlUgIPOzGCS0UiBqh r6XdySUhrPpQGxzcyXEeEyV9tYSxHAm0YgdSyNKfRIzwlRKYOCW2rzAxVkkxMF8Wz4tSY 9p8+nA1i4Xnloraa6Nh9uXEDVMhFM2zyP2ff1y5aNXHkQYKWPVIQVU0m5ehKSS2AWNG3X yfg1AXVK4wBilBOb18pudijxJgsaFnYsZI8yAOx7XkLziM4GIJg4+2q9r4CRR9p/FZw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795114352; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=ss6SV+PFlqizaJrWDEhTfQYiu9JlRuTku7nU9+88v4U=; b=xcs2tv+GjZ77aYOGNh53sw4ASWgTmQ1GPF3Y3LbTB4n5GkOpM04OIPg2L79+RFP0cCLF RPO03a6z8cpeoOdxM5V5nXTmW96At+Lm8T9aRY6GVVAB8+1LReg6xGetSo0Tbj3qTB5kz w96PVzDiiZ78cu8NCQMjdGtKidUK4ia9SJczm+CAWNl8BOfeBHLtyNxNRz9caxarM+pWv MWhf0DP7oD3zBYwGmG+c9gGUTpyKvwx5GmM0e0tBR32KacvCzwPLGBOy+7QgcQywFCtqw x8s+rpnLgW54bexxTEagjYnvAmIB5RYEyP6dw2KO/mDEj98AMmev9t+bAbUhU1F4sXA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--coltonlewis.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=fB6opchK; arc=none smtp.remote-ip=209.85.167.199 Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EDF8F606C13C for ; Thu, 19 Nov 2026 18:52:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org EDF8F606C13C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--coltonlewis.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=fB6opchK Received: by mail-oi1-f199.google.com with SMTP id 5614622812f47-4e937c5bd4fso121071b6e.2 for ; Thu, 19 Nov 2026 10:52:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1795114351; x=1795719151; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=ss6SV+PFlqizaJrWDEhTfQYiu9JlRuTku7nU9+88v4U=; b=fB6opchKrUeW2aib4tafptSBm8siWyOYBNTFyUVcVwH3ZUw9c8ddasLuK+X/Tz0BoD YvZENtPpO8JNEA/fv10ZNOpWZZeCKOZ0qiATkcT79nYy2nkffNQcpvCUffMOYJHJ+W8b 3InbZIin6kXdsM05UBDIzpPUlubHhZwZEfEuUP7vQT8QvQtNfuOJm9LpQ/gnHiqqEqh7 7GTqzcfts/yw9vkz7EtD8j8NPmxO4kieU1WIG72m2ij3JWRG4CWiig2iD2NMu6y0KvJY UojvJTNq8X8Sh+NapX67S6o+R4DujL3z+AhULUcwknLOUueoxnXT/95QstdUW493lXFG 8mYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795114351; x=1795719151; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ss6SV+PFlqizaJrWDEhTfQYiu9JlRuTku7nU9+88v4U=; b=QMn7EEdn2m544TP/4B28RErgkbOwOd2Oq4wtnDkrqR98bgRulJXh0HVH5Ff9oPWZCc 5tOyQ8OqzwRVarV4ExaOK7M7/etCQnYIKaE3mrLfNZUKMbfQpgCFeYxkgjjUq/6sXVqI Y5aMAvol1wNBeRovYzUQzX7tmDeKmRfqzkA3MPkJLca8EdaOcwPvF3JM81nWJQoqWB2V mV4YlucxpSeFQbqAZgHaSwxpllF5A9vWLaBggRwxSbymLC3086OhPlytbligY3tLe/Ts s26XAFrxBA3qx4vQ7CJriIT7k2eSDZvLB2SMEYWzY8ZtXYrySMKyGCqCrrt6HXsGRP4N nQqw== X-Forwarded-Encrypted: i=1; AL+hErEuyE+Nald/MSwcpY+z0bO7OVvStLyJ9OtAPizCLCXR4mM6krkEA4t9caZBE9A3DjTqBg1VtpHq9AR5qyM=@vger.kernel.org X-Gm-Message-State: APuU4Z+Uw1kS8mrsSW5tELBWJcUZ6aPgHcQLoKQr+ZpgsErlONSqBexg CbqZG/uZbFl271ljruxXbiVcazffUMcpd4CNkw783j+wlo2U+F+PL3dBnjHij+h0Aqyn5BapGOB Ob0PKbEheHmogciLvSybUzjsUiA== X-Received: from jaav16-n2.prod.google.com ([2002:a05:6639:1d0:20b0:61f:23a0:7d2]) (user=coltonlewis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6808:4f4f:b0:56a:dc07:f218 with SMTP id 5614622812f47-57a0a10c801mr992416b6e.20.1795114350522; Thu, 19 Nov 2026 10:52:30 -0800 (PST) Date: Thu, 19 Nov 2026 18:51:57 +0000 In-Reply-To: <20261119185215.632334-1-coltonlewis@google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261119185215.632334-1-coltonlewis@google.com> X-Mailer: git-send-email 2.56.1.809.ga0b61035b5-goog Message-ID: <20261119185215.632334-16-coltonlewis@google.com> Subject: [PATCH v10 15/33] KVM: arm64: Construct mdcr_el2 in a local variable in kvm_arm_setup_mdcr_el2() From: Colton Lewis To: Marc Zyngier , Oliver Upton Cc: Catalin Marinas , Will Deacon , Mark Rutland , Peter Zijlstra , Ingo Molnar , Paolo Bonzini , Russell King , Jonathan Corbet , Fuad Tabba , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Shuah Khan , James Clark , Alexandru Elisei , Mingwei Zhang , Ganapatrao Kulkarni , kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Construct the new MDCR_EL2 value in a local variable before writing it once to vcpu->arch.mdcr_el2. This avoids exposing intermediate states in vcpu->arch.mdcr_el2 to interrupt or NMI handlers that may inspect it, and simplifies upcoming Partitioned PMU modifications to MDCR_EL2. Signed-off-by: Colton Lewis --- arch/arm64/include/asm/kvm_nested.h | 2 +- arch/arm64/kvm/debug.c | 27 +++++++++++++++------------ arch/arm64/kvm/nested.c | 6 +++--- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/arch/arm64/include/asm/kvm_nested.h b/arch/arm64/include/asm/kvm_nested.h index 0f899addafa8b..a1ad046428a2d 100644 --- a/arch/arm64/include/asm/kvm_nested.h +++ b/arch/arm64/include/asm/kvm_nested.h @@ -90,7 +90,7 @@ extern void check_nested_vcpu_requests(struct kvm_vcpu *vcpu); extern void kvm_nested_flush_hwstate(struct kvm_vcpu *vcpu); extern void kvm_nested_sync_hwstate(struct kvm_vcpu *vcpu); -extern void kvm_nested_setup_mdcr_el2(struct kvm_vcpu *vcpu); +void kvm_nested_setup_mdcr_el2(struct kvm_vcpu *vcpu, u64 *mdcr); struct kvm_s2_trans { phys_addr_t output; diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c index f4d7b12045e8f..89c9fb0cfeee2 100644 --- a/arch/arm64/kvm/debug.c +++ b/arch/arm64/kvm/debug.c @@ -37,38 +37,41 @@ static int cpu_has_spe(u64 dfr0) */ static void kvm_arm_setup_mdcr_el2(struct kvm_vcpu *vcpu) { + u64 mdcr; + preempt_disable(); /* * This also clears MDCR_EL2_E2PB_MASK and MDCR_EL2_E2TB_MASK * to disable guest access to the profiling and trace buffers */ - vcpu->arch.mdcr_el2 = FIELD_PREP(MDCR_EL2_HPMN, - *host_data_ptr(nr_event_counters)); - vcpu->arch.mdcr_el2 |= (MDCR_EL2_TPM | - MDCR_EL2_TPMS | - MDCR_EL2_TTRF | - MDCR_EL2_TPMCR | - MDCR_EL2_TDRA | - MDCR_EL2_TDOSA); + mdcr = FIELD_PREP(MDCR_EL2_HPMN, *host_data_ptr(nr_event_counters)); + mdcr |= (MDCR_EL2_TPM | + MDCR_EL2_TPMS | + MDCR_EL2_TTRF | + MDCR_EL2_TPMCR | + MDCR_EL2_TDRA | + MDCR_EL2_TDOSA); /* Is the VM being debugged by userspace? */ if (vcpu->guest_debug) /* Route all software debug exceptions to EL2 */ - vcpu->arch.mdcr_el2 |= MDCR_EL2_TDE; + mdcr |= MDCR_EL2_TDE; /* * Trap debug registers if the guest doesn't have ownership of them. */ if (!kvm_guest_owns_debug_regs(vcpu)) - vcpu->arch.mdcr_el2 |= MDCR_EL2_TDA; + mdcr |= MDCR_EL2_TDA; if (vcpu_has_nv(vcpu)) - kvm_nested_setup_mdcr_el2(vcpu); + kvm_nested_setup_mdcr_el2(vcpu, &mdcr); + + WRITE_ONCE(vcpu->arch.mdcr_el2, mdcr); /* Write MDCR_EL2 directly if we're already at EL2 */ if (has_vhe()) - write_sysreg(vcpu->arch.mdcr_el2, mdcr_el2); + write_sysreg(mdcr, mdcr_el2); preempt_enable(); } diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c index 4d83281a7a28b..b80d90ede9004 100644 --- a/arch/arm64/kvm/nested.c +++ b/arch/arm64/kvm/nested.c @@ -2237,12 +2237,12 @@ void kvm_nested_sync_hwstate(struct kvm_vcpu *vcpu) MDCR_EL2_TDCC | \ MDCR_EL2_TDOSA) -void kvm_nested_setup_mdcr_el2(struct kvm_vcpu *vcpu) +void kvm_nested_setup_mdcr_el2(struct kvm_vcpu *vcpu, u64 *mdcr) { u64 guest_mdcr = __vcpu_sys_reg(vcpu, MDCR_EL2); if (is_nested_ctxt(vcpu)) - vcpu->arch.mdcr_el2 |= (guest_mdcr & NV_MDCR_GUEST_INCLUDE); + *mdcr |= (guest_mdcr & NV_MDCR_GUEST_INCLUDE); /* * In yet another example where FEAT_NV2 is fscking broken, accesses * to MDSCR_EL1 are redirected to the VNCR despite having an effect @@ -2252,5 +2252,5 @@ void kvm_nested_setup_mdcr_el2(struct kvm_vcpu *vcpu) * trap MDSCR_EL1. */ else if (!cpus_have_final_cap(ARM64_HAS_FGT)) - vcpu->arch.mdcr_el2 |= MDCR_EL2_TDA; + *mdcr |= MDCR_EL2_TDA; } -- 2.56.1.708.g77570a6a1d-goog