From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E29041667F1 for ; Tue, 25 Jun 2024 12:58:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.10 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719320313; cv=none; b=ILcX+iLj6mjr5nJm6zT0OBxI6UpOo25DwplTbEhztiMcPbe79kAAf0t0Gr2akSdln2bmGcCTKzP9H6yAJl0unL7QPg2/X8eT0VHb/uuBIv3seh2fHzPJsv3yArlvAgHPlRQjsH783u/v9q9FSK32pdoePGHVoJRm5LO4JrFQ1nI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719320313; c=relaxed/simple; bh=lLBI95b/xIjiHUrUedLhxc47SmekXuJZpctGOrGOIck=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=g1ZN2LE380AaqrAgvjE1GFyk52sWBKBIOVEXD2IKCczpOT+E6gLWAdYKWrBDg6YT+41Hu63s/q4begvuhYU1DpL8qauIUaveN3hVGZr+zu8bsZSEGPez4tLjJyYSEety2fxY0Pvy+lvb53k4fRbkQmsReuzsNwxm4mzt2GBTAws= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=T5TEwq5f; arc=none smtp.client-ip=192.198.163.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="T5TEwq5f" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1719320312; x=1750856312; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=lLBI95b/xIjiHUrUedLhxc47SmekXuJZpctGOrGOIck=; b=T5TEwq5fmNd/QYvBnBbaTW6hLMJxLxQ1MOdAG9x6Bfgdx7gMPWwAMBE1 GyZVz3E3iY0NCniLEcpYvACj9khlv2uBeQd+re/xCXhppfTYrRphB0M8j XpC0pvkeUNvDEbr8wFd8PzRCRNYZlGqO0sHzqYhPL6yUok7GPrrC9kZjN eY8p0c0abDRY91RfaAEUCXbB/5bteHouWV+2GVzLbx8cFPM4v9nQL4egc iS6QTdVTZlK8kTSRq5/5JNtS+pE2mmDhXhkQI2yRMr96m4o8C1q8adz4t sn6r+zLn9vSzQ6GqvBvc1OntWC0jHQ+wmjs6Xsk5Pm2u447175JHi1PAY w==; X-CSE-ConnectionGUID: bwa27MjNShOzyjoBHWABUQ== X-CSE-MsgGUID: W6erSi8qRMiw6ESvAHavqQ== X-IronPort-AV: E=McAfee;i="6700,10204,11113"; a="27740952" X-IronPort-AV: E=Sophos;i="6.08,264,1712646000"; d="scan'208";a="27740952" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jun 2024 05:57:23 -0700 X-CSE-ConnectionGUID: cHAiU3zlSF2FGKA1LyGN7Q== X-CSE-MsgGUID: YCEvZPAyQ5eXsMIhy/BhRw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,264,1712646000"; d="scan'208";a="74402237" Received: from chenyu-dev.sh.intel.com ([10.239.62.164]) by orviesa002.jf.intel.com with ESMTP; 25 Jun 2024 05:57:20 -0700 From: Chen Yu To: Dave Hansen , Thomas Gleixner , Ingo Molnar , Borislav Petkov Cc: x86@kernel.org, "H. Peter Anvin" , Arnd Bergmann , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, Juergen Gross , Nikolay Borisov , Chen Yu , Chen Yu , Qiuxu Zhuo , Prem Nath Dey , Xiaoping Zhou Subject: [PATCH v3] x86/paravirt: Disable virt spinlock on bare metal Date: Tue, 25 Jun 2024 20:54:03 +0800 Message-Id: <20240625125403.187110-1-yu.c.chen@intel.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The kernel can change spinlock behavior when running as a guest. But this guest-friendly behavior causes performance problems on bare metal. So there's a 'virt_spin_lock_key' static key to switch between the two modes. The static key is always enabled by default (run in guest mode) and should be disabled for bare metal (and in some guests that want native behavior). Performance drop is reported when running encode/decode workload and BenchSEE cache sub-workload. Bisect points to commit ce0a1b608bfc ("x86/paravirt: Silence unused native_pv_lock_init() function warning"). When CONFIG_PARAVIRT_SPINLOCKS is disabled the virt_spin_lock_key is incorrectly set to true on bare metal. The qspinlock degenerates to test-and-set spinlock, which decrease the performance on bare metal. Set the default value of virt_spin_lock_key to false. If booting in a VM, enable this key. Later during the VM initialization, if other high-efficient spinlock is preferred(paravirt-spinlock eg), the virt_spin_lock_key is disabled accordingly. The relation is described as below: X86_FEATURE_HYPERVISOR Y Y Y N CONFIG_PARAVIRT_SPINLOCKS Y Y N Y/N PV spinlock Y N N Y/N virt_spin_lock_key N N Y N Fixes: ce0a1b608bfc ("x86/paravirt: Silence unused native_pv_lock_init() function warning") Suggested-by: Dave Hansen Suggested-by: Qiuxu Zhuo Suggested-by: Nikolay Borisov Reported-by: Prem Nath Dey Reported-by: Xiaoping Zhou Signed-off-by: Chen Yu --- v2._v3: Change the default value of virt_spin_lock_key from true to false. Enable this key when it is in the VM, and disable it when needed. This makes the code more readable. (Nikolay Borisov) Dropped Reviewed-by because the code has been changed. v1->v2: Refine the commit log per Dave's suggestion. Simplify the fix by directly disabling the virt_spin_lock_key on bare metal. Collect Reviewed-by from Juergen. --- arch/x86/include/asm/qspinlock.h | 4 ++-- arch/x86/kernel/paravirt.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/qspinlock.h b/arch/x86/include/asm/qspinlock.h index a053c1293975..a32bd2aabdf9 100644 --- a/arch/x86/include/asm/qspinlock.h +++ b/arch/x86/include/asm/qspinlock.h @@ -66,13 +66,13 @@ static inline bool vcpu_is_preempted(long cpu) #ifdef CONFIG_PARAVIRT /* - * virt_spin_lock_key - enables (by default) the virt_spin_lock() hijack. + * virt_spin_lock_key - disables (by default) the virt_spin_lock() hijack. * * Native (and PV wanting native due to vCPU pinning) should disable this key. * It is done in this backwards fashion to only have a single direction change, * which removes ordering between native_pv_spin_init() and HV setup. */ -DECLARE_STATIC_KEY_TRUE(virt_spin_lock_key); +DECLARE_STATIC_KEY_FALSE(virt_spin_lock_key); /* * Shortcut for the queued_spin_lock_slowpath() function that allows diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 5358d43886ad..fec381533555 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -51,13 +51,12 @@ DEFINE_ASM_FUNC(pv_native_irq_enable, "sti", .noinstr.text); DEFINE_ASM_FUNC(pv_native_read_cr2, "mov %cr2, %rax", .noinstr.text); #endif -DEFINE_STATIC_KEY_TRUE(virt_spin_lock_key); +DEFINE_STATIC_KEY_FALSE(virt_spin_lock_key); void __init native_pv_lock_init(void) { - if (IS_ENABLED(CONFIG_PARAVIRT_SPINLOCKS) && - !boot_cpu_has(X86_FEATURE_HYPERVISOR)) - static_branch_disable(&virt_spin_lock_key); + if (boot_cpu_has(X86_FEATURE_HYPERVISOR)) + static_branch_enable(&virt_spin_lock_key); } static void native_tlb_remove_table(struct mmu_gather *tlb, void *table) -- 2.25.1