From nobody Mon Feb 9 13:18:57 2026 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8386329CB49 for ; Tue, 10 Jun 2025 22:57:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749596275; cv=none; b=ZomZgBoHX5QGM2xr123/jPKWoOCw/rz6TWKuVRuEiR2DMHcvWCLG1JDTorkwmeDO4ER8sKHuS6VuVC2yfHvOFi6CmjbFRaEVx/BR9ov2WgSph3zfrS/mOVwkw17hWhubjTNZgdQG0YJ/AsrjVq3dynrZt5hasTxmp8gOchM62RM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749596275; c=relaxed/simple; bh=IrLy/Df3wu3wMxRH1r5QDaoeLkis8ef7ilxDGxyhByY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=naM47DGrXYjdelO/PGSo1ZxyiA7SUVN6+4EZjGVhkzDLNitu5gK3Mnolmp9WeLU9Oeoo4CIJUUXY4yIkv2ZjgcYqo3B9YgTVP+OZSi3RmgSNEN4NgOcORxSl9jz9lyiDdxFBfmRnOv6+9GGjz7Lvg4mn1eEdQ7FSpBDX8tosW3o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=PUKOaA55; arc=none smtp.client-ip=209.85.215.201 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--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="PUKOaA55" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b2eea1c2e97so4187930a12.2 for ; Tue, 10 Jun 2025 15:57:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749596273; x=1750201073; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=TPKLATaGLc00m7kXvQ3la9x8CEEHoqYxndz/QonAUuw=; b=PUKOaA55UUrMe/zaVvtx3DCCb3CcNfPkA0AdHZrF7E87XRInnkMuH3qC0Yy1wQvoKJ I0v+2lxobFPs3mFn8U3iTTH90xt7nwwPLYs81H9SvoLr19QUmZ1fP8U5wTzhLmUMPl1D fktg/Yvc5HuTvKAM1vIQNk8DSUFUt3X7sLDhGDV5VUjm3PMwVsOoIJqFSXF5X1uRO3Ql eT6mar0AGPnPs3FUGlgRGwKZUTYr2Gey/fUyT9rj2klhl917aJLCl8INJcMlREQHF+VV jnz4PvKFM17PjK4mY4nvuv6lxVlceFF9gpZ9GjetqAyO7aH1lQgrQdQOptp8cmRabGj7 PuEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749596273; x=1750201073; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TPKLATaGLc00m7kXvQ3la9x8CEEHoqYxndz/QonAUuw=; b=MfJhoh4xCOXgY77YfDIHKZDOS18ehgaWPqmYh1rYic/TGiS5lDUaBd22k+Au7sKYKl H86wKITpAZiIJ5W+tKj0kae8wZPZw72xwnPJD/2yZZl4FQmZshE+YcniR373GfXHVXl9 TEqR9Qrmji1aWj7lDPY5EqT2AODcBST2zq3rkuRi9FwmIJbgEPrFYZTCnze07AaIeDEs XyGUG6f/2umtalyXG4ya3mgIAsned2i+ZwqkEXp0JauYETxOLldvXvRf+PNmEq5liQy0 8f5CfwR1m9T8IrCCkmYMErBaQCeW+Lraf3PjcEbRpy3QA/robPZ1TF6hXsfoVZ8G9O7T iuvw== X-Forwarded-Encrypted: i=1; AJvYcCV/iGtpKG4i765WKvlrm4Fe5j78VtAv3Cxs+42Die//6TFGMb9IS0SauRq1xhA1CvOG9A0Y+/UIybiMWBw=@vger.kernel.org X-Gm-Message-State: AOJu0YwlDxwIBD+8NU7VAf7HLf6ZtjL7yYG9wk7teNBRzs2/iVIqiXRS uyihScJXXKT9In4lz9kvHgrPLd/LT+y83cSUE0zSRAVVhHcqodhwrP5eO/rStbVnAyfSRjQAVZr aQjAPGg== X-Google-Smtp-Source: AGHT+IFHmWkw5WMiuFEFFkIcQA8B9UzGjXdAO5xpW5JgeQVVsN57Lc31dpZTMJm+3EEUe76E0nIN8Hgi7Xo= X-Received: from plsc8.prod.google.com ([2002:a17:902:b688:b0:235:f4e3:ba29]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e548:b0:224:910:23f6 with SMTP id d9443c01a7336-23641b29b81mr12563265ad.45.1749596272908; Tue, 10 Jun 2025 15:57:52 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 10 Jun 2025 15:57:12 -0700 In-Reply-To: <20250610225737.156318-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250610225737.156318-1-seanjc@google.com> X-Mailer: git-send-email 2.50.0.rc0.642.g800a2b2222-goog Message-ID: <20250610225737.156318-8-seanjc@google.com> Subject: [PATCH v2 07/32] KVM: x86: Use non-atomic bit ops to manipulate "shadow" MSR intercepts From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Chao Gao , Borislav Petkov , Xin Li , Dapeng Mi , Francesco Lavra , Manali Shukla Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Manipulate the MSR bitmaps using non-atomic bit ops APIs (two underscores), as the bitmaps are per-vCPU and are only ever accessed while vcpu->mutex is held. Signed-off-by: Sean Christopherson Reviewed-by: Binbin Wu --- arch/x86/kvm/svm/svm.c | 12 ++++++------ arch/x86/kvm/vmx/vmx.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 7e39b9df61f1..ec97ea1d7b38 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -789,14 +789,14 @@ static void set_shadow_msr_intercept(struct kvm_vcpu = *vcpu, u32 msr, int read, =20 /* Set the shadow bitmaps to the desired intercept states */ if (read) - set_bit(slot, svm->shadow_msr_intercept.read); + __set_bit(slot, svm->shadow_msr_intercept.read); else - clear_bit(slot, svm->shadow_msr_intercept.read); + __clear_bit(slot, svm->shadow_msr_intercept.read); =20 if (write) - set_bit(slot, svm->shadow_msr_intercept.write); + __set_bit(slot, svm->shadow_msr_intercept.write); else - clear_bit(slot, svm->shadow_msr_intercept.write); + __clear_bit(slot, svm->shadow_msr_intercept.write); } =20 static bool valid_msr_intercept(u32 index) @@ -862,8 +862,8 @@ static void set_msr_interception_bitmap(struct kvm_vcpu= *vcpu, u32 *msrpm, bit_write =3D 2 * (msr & 0x0f) + 1; tmp =3D msrpm[offset]; =20 - read ? clear_bit(bit_read, &tmp) : set_bit(bit_read, &tmp); - write ? clear_bit(bit_write, &tmp) : set_bit(bit_write, &tmp); + read ? __clear_bit(bit_read, &tmp) : __set_bit(bit_read, &tmp); + write ? __clear_bit(bit_write, &tmp) : __set_bit(bit_write, &tmp); =20 msrpm[offset] =3D tmp; =20 diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 9ff00ae9f05a..8f7fe04a1998 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -4029,9 +4029,9 @@ void vmx_disable_intercept_for_msr(struct kvm_vcpu *v= cpu, u32 msr, int type) idx =3D vmx_get_passthrough_msr_slot(msr); if (idx >=3D 0) { if (type & MSR_TYPE_R) - clear_bit(idx, vmx->shadow_msr_intercept.read); + __clear_bit(idx, vmx->shadow_msr_intercept.read); if (type & MSR_TYPE_W) - clear_bit(idx, vmx->shadow_msr_intercept.write); + __clear_bit(idx, vmx->shadow_msr_intercept.write); } =20 if ((type & MSR_TYPE_R) && @@ -4071,9 +4071,9 @@ void vmx_enable_intercept_for_msr(struct kvm_vcpu *vc= pu, u32 msr, int type) idx =3D vmx_get_passthrough_msr_slot(msr); if (idx >=3D 0) { if (type & MSR_TYPE_R) - set_bit(idx, vmx->shadow_msr_intercept.read); + __set_bit(idx, vmx->shadow_msr_intercept.read); if (type & MSR_TYPE_W) - set_bit(idx, vmx->shadow_msr_intercept.write); + __set_bit(idx, vmx->shadow_msr_intercept.write); } =20 if (type & MSR_TYPE_R) --=20 2.50.0.rc0.642.g800a2b2222-goog