From nobody Mon Apr 6 09:43:46 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 062FDC6FA82 for ; Thu, 8 Sep 2022 23:26:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229609AbiIHX0L (ORCPT ); Thu, 8 Sep 2022 19:26:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229771AbiIHX0H (ORCPT ); Thu, 8 Sep 2022 19:26:07 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1AEAE3D77; Thu, 8 Sep 2022 16:26:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662679564; x=1694215564; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Q5um5aONO7+CjLGrGHvgwAkBekvzLE2bkGPRvzcCfEc=; b=Q39K/vKEvmoLdphyj5URhVrc7L6IN3NR2ZaSHlcy5nMlEcip1OK6rrOD PZhMCzEd6E8NwPDe8lbWEvtyK/U3Fk3HhYUk7ehg8jdDrEPcQ3kr9ZaKJ MV3ZtRDIEjCvpUEHjafPgPxL5BV8HtxdcNRFgSidqAHJcZ2GbImO5WiKp oUSvDeLYUe55e9kUvZNFUIs3puNmqmyz+T5ly9NwjP8rHf23PYlZn64hu kqsgsA9sijWdHoP7GVy0lzWPrj+NHmLohywhqFJsFgUkqv0UENA5laWli apAHA6QudqTxL0XUATQKBUBqxAhNDg8e9wHB9IohqwA5dTO5+B+yAJogY Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10464"; a="298686973" X-IronPort-AV: E=Sophos;i="5.93,300,1654585200"; d="scan'208";a="298686973" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2022 16:26:03 -0700 X-IronPort-AV: E=Sophos;i="5.93,300,1654585200"; d="scan'208";a="610863144" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2022 16:26:03 -0700 From: isaku.yamahata@intel.com To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Paolo Bonzini , Sean Christopherson , Marc Zyngier , Will Deacon , Yuan Yao Cc: isaku.yamahata@intel.com, isaku.yamahata@gmail.com, Kai Huang , Chao Gao , Atish Patra , Shaokun Zhang , Qi Liu , John Garry , Daniel Lezcano , Huang Ying , Huacai Chen , Yuan Yao Subject: [PATCH v4 02/26] KVM: x86: Use this_cpu_ptr() instead of per_cpu_ptr(smp_processor_id()) Date: Thu, 8 Sep 2022 16:25:18 -0700 Message-Id: <199c87dbdb8d3ec10e650c4919709257e887ba1c.1662679124.git.isaku.yamahata@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata convert per_cpu_ptr(smp_processor_id()) to this_cpu_ptr() as trivial cleanup. Signed-off-by: Isaku Yamahata Reviewed-by: Chao Gao Reviewed-by: Yuan Yao --- 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 73dccc952dd1..0368eab6a7b5 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -428,8 +428,7 @@ static void kvm_user_return_msr_init_cpu(struct kvm_use= r_return_msrs *msrs) =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 kvm_user_return_msr_init_cpu(msrs); @@ -453,8 +452,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); --=20 2.25.1