From nobody Sat Feb 7 15:44:29 2026 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.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 6DA211ABEB3 for ; Fri, 2 Aug 2024 20:16:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722629794; cv=none; b=W3K8ysj+qdYlR2XKyOhNDU1mzDcG7FWmAOSALUqq/qBnUW1IiNZi0Q3TJ0llF1PbzWIxBU/CmfbmAy2b5wvnN1i7KKEMpfSQ1IkJILk2VKSNUTGCTPBXsD27J5KIF/Z0k3+Xw0Wv97lRaZQ6CHP9EN5tw278CfzsnRyWvuHNcLs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722629794; c=relaxed/simple; bh=TXvdlxOVU7doVd8ZsCfPhM1Ucj5S0xNZ2Rcj/xvqPgc=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=U9kxYR1nju1GXF+0bttCZ8Zm9SGGpOk8HB6A1iAp16cDIIIsrHDqNUM+Bncbj/xiWbdOXFGokROyW8M4JSzXr0GSFU4aqj8ymFxidxL0j7Q7klU/evCWTuL6HtfAaGmQkv+kWcEXKaHEfatRgTM/77bW5+GdvjS73Ng21pdvnHc= 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=0HY8IUiH; arc=none smtp.client-ip=209.85.210.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="0HY8IUiH" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-71065f49abeso2237331b3a.3 for ; Fri, 02 Aug 2024 13:16:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1722629793; x=1723234593; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:reply-to:from:to:cc :subject:date:message-id:reply-to; bh=jZQFLav+WlDGG6CozZMcdSkYFx1BmtT+dLZeZWTkJks=; b=0HY8IUiH+anGj05Z1ZKisCJvw9fuBaiTE09x8iDjrZqXj/ReWC626MsvdJ3gnCkXWx +TXRp0cAhlgOnHOHJLXQU32efo104BNZ3OLsaHhADYeUH8UixsOouTuboOZNAqxbR+W8 T+kenzNTsa6B2z2kXrFAVbsJU57OvdQGt8AFYL4AzpG3xh5FmjHULYu/NCryDvyk0cKm C9se5OTzTOCDvny+Kg2bH8BGReGw7iAcUAALcu8I6z4wwi70RQUF1J/iqXnzKEUKVvdi Y3RWX0aIeotu5+1+PodLJ+KGETg96z2n4/lXHrJKw1kn4BY5OdvtdoTWPMv92vcjL8M9 mK0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722629793; x=1723234593; h=cc:to:from:subject:message-id:mime-version:date:reply-to :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jZQFLav+WlDGG6CozZMcdSkYFx1BmtT+dLZeZWTkJks=; b=C5PfcTKHHt3ErQZuD3freY5DxASXaY6jrvuz9cmX1SoLLUpmwmbMRpEnO3fcPk94MM 8lupU264m7DKERq7NtSeNIVvBihVoBRx2vSUvpThrZhY8Vy7xgpsV4vaqJNvfk1fB9c6 S3bnSzgebYe7FOeA9cdztdwrqfPF1Qe/lRtfB3xYqIrwRddj7HW7RTb05SEM+Sa81wkU 9XEJY2UGT6vWscTk9XjcAQy8iAwpqR59SGQwKp3v2ixgaHJ9yTTCJUJ4WaLSwAam3Omt HRsTP4Yum50IHayMJKpnAkPhQanmqSF+HqeLPACUWeUs7wwIDm1DEcA9QxxLDf3st+Hj 942w== X-Forwarded-Encrypted: i=1; AJvYcCXGDeh42SAeDXik7VD8W+g+75j9SWUXl0V61cgtJSD6lA5uSKLfk68/ccY7eaF0G4OVqsQ+jMjNefohA7Gex967Q0hv6R6XEs2vQiSH X-Gm-Message-State: AOJu0YyqTpz5zbrw30a0nJALGz9UeNZZ/D+K/gAAtCg/jIvnwkfsBcLc fJasY3A5usDqOV/q3M3F9MSS6qvXJMiMAMJu0aKXko9pk/l15j5qz+m0gu/uMZ7rm/6PaeDJqzu Jgg== X-Google-Smtp-Source: AGHT+IFb99jmBNeDqQRBYLcydt+zXBMQx4p/CU8oV2WUABtLxdEGZvp3I6qLVp2sa1B93X8GgzfSYMLoBaw= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:aa7:8e9c:0:b0:70b:a46:7dfa with SMTP id d2e1a72fcca58-7106d0a4be6mr112403b3a.5.1722629792616; Fri, 02 Aug 2024 13:16:32 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 2 Aug 2024 13:16:30 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.46.0.rc2.264.g509ed76dc8-goog Message-ID: <20240802201630.339306-1-seanjc@google.com> Subject: [PATCH] KVM: x86: Use this_cpu_ptr() instead of per_cpu_ptr(smp_processor_id()) From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Isaku Yamahata , Chao Gao , Yuan Yao Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata Use this_cpu_ptr() instead of open coding the equivalent in various user return MSR helpers. Signed-off-by: Isaku Yamahata Reviewed-by: Chao Gao Reviewed-by: Yuan Yao [sean: massage changelog] Signed-off-by: Sean Christopherson Reviewed-by: Pankaj Gupta --- Not entirely sure where this came from, found it in one of my myriad branch= es while doing "spring" cleaning. arch/x86/kvm/x86.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index af6c8cf6a37a..518baf47ef1c 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -427,8 +427,7 @@ static void kvm_user_return_msr_cpu_online(void) =20 int kvm_set_user_return_msr(unsigned slot, u64 value, u64 mask) { - unsigned int cpu =3D smp_processor_id(); - struct kvm_user_return_msrs *msrs =3D per_cpu_ptr(user_return_msrs, cpu); + struct kvm_user_return_msrs *msrs =3D this_cpu_ptr(user_return_msrs); int err; =20 value =3D (value & mask) | (msrs->values[slot].host & ~mask); @@ -450,8 +449,7 @@ EXPORT_SYMBOL_GPL(kvm_set_user_return_msr); =20 static void drop_user_return_notifiers(void) { - unsigned int cpu =3D smp_processor_id(); - struct kvm_user_return_msrs *msrs =3D per_cpu_ptr(user_return_msrs, cpu); + struct kvm_user_return_msrs *msrs =3D this_cpu_ptr(user_return_msrs); =20 if (msrs->registered) kvm_on_user_return(&msrs->urn); base-commit: 332d2c1d713e232e163386c35a3ba0c1b90df83f --=20 2.46.0.rc2.264.g509ed76dc8-goog