From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 202E432863F for ; Thu, 13 Nov 2025 23:14:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763075671; cv=none; b=CpqzyFUdmWcOdh33emOm5kd9C3v3E6tiqGoJDLyZfhIjNdmQGt8zUuVNY0HhSIGcoCL0+uEqfhHlYJXHIJaQ+nX1HKtgk7xwyfAUH9T8ucoZG8yVAXFX7f+Xstdj4A8cKhiK2yD+XfnAym4qJp4Gq0ct2fr6lXUN/dbjyFZXZJY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763075671; c=relaxed/simple; bh=vjdcnE9j6DWj5tt+geNrMXKpk9jVp5Vfl/GVdQFul+o=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=OT8KJSvkUJvIINuzsxqONofq153wS6Z2fDZzC3iZQD432RTXanPIWF4C+xTquQL79++tgEDGzxpzhyeDPI5kW9w10+rCCwhtd3PU0kqk3pPcCPz71WJqTFTwEf/RSS/CZ5WWNXetr5NCJX4TcYTCsQUDxQ4AHkitgjp+ajtYq7s= 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=wqBHUXTi; arc=none smtp.client-ip=209.85.214.202 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="wqBHUXTi" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-297f3710070so37593515ad.2 for ; Thu, 13 Nov 2025 15:14:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763075669; x=1763680469; 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=4LiByP2+jsRRbpzgg8uE1tGPH47KWMDv0M5tBso2MkY=; b=wqBHUXTiqexaL896p1IOxWNfO6d0huE35qIZyfgnTay9bGhxeOZWLtfLoMhaoLD5Gd TLCq02fmnhUAVnDwNW6KqDl2+JyworagETyA4ZXSdZRJBRDlByK9KiNb1EBgbSNQrNTK FBMBxYgmuDJ8jFWf5SqpwqaRSrNHx8TRQqbcl+CG84be8eAegRn3MvbX9arz+aX09Erg ydgrY4qnkb6n71F4+wN+c3/jeU5UeB+ZyWgs9IRkKUU97Ay+JG+QGfRWpFr3ESqRNeps IEZsfIDjGfJvp+MgWDpxWylAe66P3HbCZtB5WmDt4mtEDkf0OguzC6m/0bMHZTWd3Pkg b4uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763075669; x=1763680469; 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=4LiByP2+jsRRbpzgg8uE1tGPH47KWMDv0M5tBso2MkY=; b=kGdkF3Vqp/bGxweStTb1sYA2PAAHQjR0l1BLjpZFi2GUOk3LE7w9nryuFQ84hVpWZd BZ7u6mfUFB5xWo2dW2Z/j4UqtHVbhUuZS/wogb1ymhbXUsPBxGgtJ4ceVgZjq+RAsQii SmH+IKlv5ulnv4d2ZO9IkV6T7G+TaFZQ3Hca1khz61Y8TQS0Dm4c8/v+SkwAHRR0ZV8w Dv70aaB1YXBYNZdJ+lbdHfaVSX6uAeTplJFz2VPvZFfB0SvxEewTrHkuLNCyEkpj0we5 MsjmSOj5HhEGQtRiBdQ3TbPR2wPh5VeXh5MMTImKniGhRmcq0IUU+mYXqc/PTUqE7Rzj x8Bg== X-Forwarded-Encrypted: i=1; AJvYcCWmcQTp2ta83rmgkBwnpkKH/J0rc2wdmr/CH5DvYiUOi9BYh7BP8Y40SLFMHQs+YjQpF0N2hQAQq7ZkXxs=@vger.kernel.org X-Gm-Message-State: AOJu0YwUoLFGwfvZ96vIhQ2ATyGIwi3E6K0DPp5GtIZngAOb08yUAmIC TuGGg5nVPVIa2CTXOufOBquYGWCsbaSxg0pnP4xZfZh4Yzt2Gk6MelJU//jm/akGgQ7nlfRKZDs TDzSzJw== X-Google-Smtp-Source: AGHT+IFbx98nfw2mf982cjJrcNUrD3h03uR2zGX33yHs/oArPayGaQuFP+5p/PFmyJVh6nb7XuKhxfjvcUE= X-Received: from plbka8.prod.google.com ([2002:a17:903:3348:b0:295:377d:bfc5]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:46c8:b0:295:50cd:e759 with SMTP id d9443c01a7336-2986a76f495mr7488025ad.58.1763075669481; Thu, 13 Nov 2025 15:14:29 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 13 Nov 2025 15:14:19 -0800 In-Reply-To: <20251113231420.1695919-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: <20251113231420.1695919-1-seanjc@google.com> X-Mailer: git-send-email 2.52.0.rc1.455.g30608eb744-goog Message-ID: <20251113231420.1695919-5-seanjc@google.com> Subject: [PATCH 4/5] KVM: SVM: Skip OSVW variable updates if current CPU's errata are a subset From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Elide the OSVW variable updates if the current CPU's set of errata are a subset of the errata tracked in the global values, i.e. if no update is needed. There's no danger of under-reporting errata due to bailing early as KVM is purely reducing the set of "known fixed" errata. I.e. a racing update on a different CPU with _more_ errata doesn't change anything if the current CPU has the same or fewer errata relative to the status quo. If another CPU is writing osvw_len, then "len" is guaranteed to be larger than the new osvw_len and so the osvw_len update would be skipped anyways. If another CPU is setting new bits in osvw_status, then "status" is guaranteed to be a subset of the new osvw_status and the bitwise-OR would be an effective nop anyways. Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/svm.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index d3f0cc5632d1..152c56762b26 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -420,7 +420,6 @@ static void svm_init_osvw(struct kvm_vcpu *vcpu) static void svm_init_os_visible_workarounds(void) { u64 len, status; - int err; /* * Get OS-Visible Workarounds (OSVW) bits. @@ -449,20 +448,19 @@ static void svm_init_os_visible_workarounds(void) return; } - err = native_read_msr_safe(MSR_AMD64_OSVW_ID_LENGTH, &len); - if (!err) - err = native_read_msr_safe(MSR_AMD64_OSVW_STATUS, &status); + if (native_read_msr_safe(MSR_AMD64_OSVW_ID_LENGTH, &len) || + native_read_msr_safe(MSR_AMD64_OSVW_STATUS, &status)) + len = status = 0; + + if (status == READ_ONCE(osvw_status) && len >= READ_ONCE(osvw_len)) + return; guard(spinlock)(&osvw_lock); - if (err) { - osvw_status = osvw_len = 0; - } else { - if (len < osvw_len) - osvw_len = len; - osvw_status |= status; - osvw_status &= (1ULL << osvw_len) - 1; - } + if (len < osvw_len) + osvw_len = len; + osvw_status |= status; + osvw_status &= (1ULL << osvw_len) - 1; } static bool __kvm_is_svm_supported(void) -- 2.52.0.rc1.455.g30608eb744-goog