From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.167.198 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795114350; b=jFaryejgvHkNQ3aIJml0UBPVLH8xLTQqcmuoNBHCMqkvja97vhAPGV2W5X9kdhT49vkU 5uwF9XIiHpcBlcyGO6uV9iB9+M/CYYuu4cAnHAwvmVzm6PkwuFVJDvKUZHoyO5i+qeyEd LZnxjGVc95bQlVxcy6j+xpXpjn8KYyooODa2AReQj6Ac4fclX6b9g5irWb/7B6AkLN+Fn PIYC76ZTNvn2Ut7N/liXN9dTI2yALk+ejf0WdD0q2mt0yWhlMYncV6ftMH2nwghOQmKTQ DmGvTInR3pOv6GQf1YXABZ3KWJ+94Oj4lr9FOXYVKMgJoChsecFLZJpkFIEWaM9f/Cg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795114350; 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=Dri93dGf86JD2a4x55noboCN1Q6q179kTQsK767li90=; b=BgJUU7MwHssnwz9OBwWGLvZqwme6cFt9MKxYMGTFFnfwC5KRnlru3BAPoiZRZ53HYkcE bYMCjRUvtW1duUY1qzAK7BU0oQdUY2bn7fbbkqnYmfCIzxXakDHI/a582OphQm1et1sWP etZgRq/NwmTbWkk+Kywe9i2fdsdYdD/+yfFf/PbGefJ1ZOVWu1Z14RIve49STTTDiZU43 TGQ3zZxePCxHkiwACvCH4ai6+kAwiDzmTXuLwgtt1AD3mixUo596Rcp30lEQWNjmqfWw0 5nRaAQ+z+s8A+UBYYeCvpkPjeztaafngnr8OxPSmgEtucFFrHFs49xkXrW5iDZvHXZw== 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=istjwH1u; arc=none smtp.remote-ip=209.85.167.198 Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) (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 B9D31606B53C for ; Thu, 19 Nov 2026 18:52:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org B9D31606B53C 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=istjwH1u Received: by mail-oi1-f198.google.com with SMTP id 5614622812f47-4e778acdbc6so171620b6e.3 for ; Thu, 19 Nov 2026 10:52:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1795114349; x=1795719149; 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=Dri93dGf86JD2a4x55noboCN1Q6q179kTQsK767li90=; b=istjwH1uDtIuP/hVh9STL+elAXD+Md4rxfVCQ5xDwA4uMSRilEvwlspwj8AzFZeLdl G978XmYe0mQRFfhlnOesU+fCAzp+QZ3FO9/PewFgKIz1u1WKgYh7WPG8Vjf0gOttzYoD NBOF9g4VbnMqKLPK7GeFgLN9SJowLI+oCYGaW9vZGYsamZJH0tvKRhELL20EhHTTZ6Pc h4jrX5sBM74Elcyi9TsU3tNcTnpEsGxL0RYYJW0Lipzyyr4LJQWztXNR3ezqYZ96degl Ylt/s++522lJwdrDmW3ytIGAfl8gqmzBVNsp+CoIDdQCovlZBn3Pd/BEmvcOEk+j0M3E 6TqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795114349; x=1795719149; 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=Dri93dGf86JD2a4x55noboCN1Q6q179kTQsK767li90=; b=Vl5cUo9Oel0z9Phg3LAMHOh2sFxWqGhRM/uKaqnUAwxorIBBDZARI2GSzo4cFTaoY5 3Ywpf6l4IaJNFwHEd9i78ffNHaM1AnVS0RQ/g9s/LRG/BAjxvUOzW1Idc/Ippy3yjYfO PMS81FaAq1jPLGEIDmh0Hb5sdyQiwJldwZD9/MiVQz61HXJyO2JklVNpbpcfjXLqvkg4 gmaDLtSsNVxHFWHboL0jv5NaInrlYZHYJKMV9X1qxXRcYs4a5rvO+Cu2dBhQX51+hJKm 3TQosHMCDOAsujBlt3h0KrfsQ8wss810tkPOrmX0gITur7bwA8jdG7FNLuW7pV3hjF1E Qr+A== X-Forwarded-Encrypted: i=1; AL+hErGpLIEyGFGGJAlIHrkiAkZ1aweAqhJZxX80ybsrkdTXes5fX1NJjC9jDKzrNdP2N8T9ulOhYdVvvWvZVUg=@vger.kernel.org X-Gm-Message-State: APuU4Z+cm8Uw9igXwzW0DkpSBSEMpld4dc987LO/CsSdutzJvfmTAjBE IORs4lnHBceWCeOBDgmDn+quFHghLQfLR4Zss6zTCExv+uYQguxgQMOrkFZRBWOEv/y18UtUreU DeJEMu8iBSJmiza7tKRrjLyjl5Q== X-Received: from iok4-n1.prod.google.com ([2002:a05:6602:c604:10b0:9cb:3bd8:aa36]) (user=coltonlewis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6808:1805:b0:549:572c:fd42 with SMTP id 5614622812f47-57a0bb85010mr976405b6e.47.1795114348499; Thu, 19 Nov 2026 10:52:28 -0800 (PST) Date: Thu, 19 Nov 2026 18:51:55 +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-14-coltonlewis@google.com> Subject: [PATCH v10 13/33] KVM: arm64: Make __vcpu_rmw_sys_reg() atomic 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" Use try_cmpxchg_local() in __vcpu_rmw_sys_reg() so read-modify-write updates to vCPU system registers are atomic with respect to local interrupts and GICv3 pseudo-NMIs. This prevents lost updates when a PMU overflow handler (which may run as a pseudo-NMI that is not masked by local_irq_save()) updates PMOVSSET_EL0 concurrently with vCPU register accesses. Signed-off-by: Colton Lewis --- arch/arm64/include/asm/kvm_host.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 89683a690828e..103c25001c0d2 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -1313,12 +1313,14 @@ u64 kvm_vcpu_apply_reg_masks(const struct kvm_vcpu *, enum vcpu_sysreg, u64); #define __vcpu_rmw_sys_reg(v, r, op, val) \ do { \ const struct kvm_cpu_context *ctxt = &(v)->arch.ctxt; \ - u64 __v = ctxt_sys_reg(ctxt, (r)); \ - __v op (val); \ - if (vcpu_has_nv((v)) && (r) >= __SANITISED_REG_START__) \ - __v = kvm_vcpu_apply_reg_masks((v), (r), __v); \ - \ - ctxt_sys_reg(ctxt, (r)) = __v; \ + u64 __old = READ_ONCE(ctxt_sys_reg(ctxt, (r))); \ + u64 __new; \ + do { \ + __new = __old; \ + __new op (val); \ + if (vcpu_has_nv((v)) && (r) >= __SANITISED_REG_START__) \ + __new = kvm_vcpu_apply_reg_masks((v), (r), __new); \ + } while (!try_cmpxchg_local(__ctxt_sys_reg(ctxt, (r)), &__old, __new)); \ } while (0) #define __vcpu_sys_reg(v,r) \ -- 2.56.1.708.g77570a6a1d-goog