From mboxrd@z Thu Jan 1 00:00:00 1970 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 BAC7CECAAD3 for ; Fri, 2 Sep 2022 02:19:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235368AbiIBCTl (ORCPT ); Thu, 1 Sep 2022 22:19:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234960AbiIBCS3 (ORCPT ); Thu, 1 Sep 2022 22:18:29 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F255AA4C9; Thu, 1 Sep 2022 19:18:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662085099; x=1693621099; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dGgh1fBii19rynGcNWo4YOc+BKQW6hO1QduqyeeSino=; b=OQPUuL6qCh5pctD0JQZtkQ/IkxWfAa96gMSxNqnVcde7eo05mYtNG1EE QWhUZ+HhvHd2SJeB5K13XasxVqmqC7ShSjKKWMptM9gk5vyMwDjSLuz1g zQxp0zFItaXLL8Y0RgMg91LR3bw6OpuE0F30dXitr4UTuaj9L6pe0NEpW BCgLG9cyysHag93gKCsqhrmW8X80oNebm88s1oagRwjve47mw9mwcD018 E+miQrvqS7wjaIC4kw5/llAeAXCwMSDrrSBxgMY0Qe+0oplOi+1HMwMkp g1UNfNlNegZl5BJ5C+S9FB2IW5Ghl2yjzE5FIqzqpAPltXCcgYkxS+k/p Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10457"; a="297157858" X-IronPort-AV: E=Sophos;i="5.93,281,1654585200"; d="scan'208";a="297157858" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Sep 2022 19:18:19 -0700 X-IronPort-AV: E=Sophos;i="5.93,281,1654585200"; d="scan'208";a="608835657" 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; 01 Sep 2022 19:18:18 -0700 From: isaku.yamahata@intel.com To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Paolo Bonzini , Sean Christopherson , Thomas Gleixner , Marc Zyngier , Will Deacon 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 , Dave Hansen , Borislav Petkov Subject: [PATCH v3 16/22] KVM: kvm_arch.c: Remove a global variable, hardware_enable_failed Date: Thu, 1 Sep 2022 19:17:51 -0700 Message-Id: <91715ddc16f001bf2b76f68b57ebd59092b40591.1662084396.git.isaku.yamahata@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Isaku Yamahata A global variable hardware_enable_failed in kvm_arch.c is used only by kvm_arch_add_vm() and hardware_enable(). It doesn't have to be a global variable. Make it function local. Signed-off-by: Isaku Yamahata --- virt/kvm/kvm_arch.c | 49 +++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/virt/kvm/kvm_arch.c b/virt/kvm/kvm_arch.c index de39d0127584..f7dcde842eb5 100644 --- a/virt/kvm/kvm_arch.c +++ b/virt/kvm/kvm_arch.c @@ -13,14 +13,13 @@ #include static cpumask_t cpus_hardware_enabled = CPU_MASK_NONE; -static atomic_t hardware_enable_failed; __weak int kvm_arch_post_init_vm(struct kvm *kvm) { return 0; } -static void hardware_enable(void *caller_name) +static int __hardware_enable(void *caller_name) { int cpu = raw_smp_processor_id(); int r; @@ -28,18 +27,22 @@ static void hardware_enable(void *caller_name) WARN_ON_ONCE(preemptible()); if (cpumask_test_cpu(cpu, &cpus_hardware_enabled)) - return; - - cpumask_set_cpu(cpu, &cpus_hardware_enabled); - + return 0; r = kvm_arch_hardware_enable(); - - if (r) { - cpumask_clear_cpu(cpu, &cpus_hardware_enabled); - atomic_inc(&hardware_enable_failed); + if (r) pr_warn("kvm: enabling virtualization on CPU%d failed during %s()\n", cpu, (const char *)caller_name); - } + else + cpumask_set_cpu(cpu, &cpus_hardware_enabled); + return r; +} + +static void hardware_enable(void *arg) +{ + atomic_t *failed = arg; + + if (__hardware_enable((void *)__func__)) + atomic_inc(failed); } static void hardware_disable(void *junk) @@ -65,15 +68,16 @@ __weak void kvm_arch_pre_hardware_unsetup(void) */ __weak int kvm_arch_add_vm(struct kvm *kvm, int usage_count) { + atomic_t failed; int r = 0; if (usage_count != 1) return 0; - atomic_set(&hardware_enable_failed, 0); - on_each_cpu(hardware_enable, (void *)__func__, 1); + atomic_set(&failed, 0); + on_each_cpu(hardware_enable, &failed, 1); - if (atomic_read(&hardware_enable_failed)) { + if (atomic_read(&failed)) { r = -EBUSY; goto err; } @@ -96,27 +100,20 @@ __weak int kvm_arch_del_vm(int usage_count) __weak int kvm_arch_online_cpu(unsigned int cpu, int usage_count) { - int ret = 0; + int ret; ret = kvm_arch_check_processor_compat(); if (ret) return ret; + if (!usage_count) + return 0; /* * Abort the CPU online process if hardware virtualization cannot * be enabled. Otherwise running VMs would encounter unrecoverable * errors when scheduled to this CPU. */ - if (usage_count) { - WARN_ON_ONCE(atomic_read(&hardware_enable_failed)); - - hardware_enable((void *)__func__); - if (atomic_read(&hardware_enable_failed)) { - atomic_set(&hardware_enable_failed, 0); - ret = -EIO; - } - } - return ret; + return __hardware_enable((void *)__func__); } __weak int kvm_arch_offline_cpu(unsigned int cpu, int usage_count) @@ -149,5 +146,5 @@ __weak void kvm_arch_resume(int usage_count) return; /* FIXME: disable KVM */ if (usage_count) - hardware_enable((void *)__func__); + (void)__hardware_enable((void *)__func__); } -- 2.25.1