From patchwork Mon Nov 28 16:40:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 26882 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5820465wrr; Mon, 28 Nov 2022 09:13:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf55M9E0wl+bBSTuPrnCtJczu6PZErSN1SiUpOCve4b3tm54hIt1txADr8Wt9mV6v5kHavu0 X-Received: by 2002:a17:906:264f:b0:7c0:7f85:a3a with SMTP id i15-20020a170906264f00b007c07f850a3amr1857140ejc.432.1669655634915; Mon, 28 Nov 2022 09:13:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669655634; cv=none; d=google.com; s=arc-20160816; b=mONuBpqRoVhuVd8QBBi/k+ngZidTvJxP2PKOJzOXVEUzdq5zPj6yxCOz4gLmSC+qm5 5jCVpsE2Fn9C9Z/Ppq6UJnhUKQHRNSpqI8MxcO7BA0iMFZe+XEeee7vtsGVi1zpyIJdo rLNW71eF5n18saCreAf5tg7SFaxqipop7xZa7N0S1jcFIYYvb9GziEU2NbclsQmyuAeE oEXOesFwUOUJ4G9uBGipQq43pprb0ukX5SrUIUDrPBfgrFjTT7KjhnlUl45l4Q3HLM8k zoMBxAgHMlvEYSRsDlrDmDMWS/Kz8UZl8SA/OoNRNRLCUajk2FKfnGYDvb8X/yuwu0LX Lw1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=h67evQAcQYPtSLJtL4PjMUFQn9t8Ad0TuUjxRK0x0Q0=; b=jxFs7JkrcIl8WqQhchfx07I+LxZddmxDfRUvh0h6SoyDV1GnEYCcox60jKmrP4mUO2 Vou0TL2TZgQk+gFmnSr+/hnIHHIl3LURE/Bvfs7Xh7/7bBknjRTBHIIXkavQsKm2LGof DcFpBddvsFaHRAkb4o78Boo+PxKemgUiBwTsI7oa/ABrqoTGjRNmy2cNrM6ATzPta3fF dK9GRzJqeHz0FB6xlNEeHs9l/is720kdDFA+4tTG0HMYvU4a+fFy5KSGAD526DVlnv6A bmyyEfVFNCufCjF0kFknRukqY2axd/11blE/c2A6VivqZ+auTae6eQzm5alDKI4DsaY5 XRIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="NyioUtV/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b8-20020a0564021f0800b0046b2840ca3dsi2802497edb.474.2022.11.28.09.13.29; Mon, 28 Nov 2022 09:13:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="NyioUtV/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232867AbiK1RFb (ORCPT + 99 others); Mon, 28 Nov 2022 12:05:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231807AbiK1REb (ORCPT ); Mon, 28 Nov 2022 12:04:31 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F203860F6 for ; Mon, 28 Nov 2022 09:04:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669655063; x=1701191063; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=avx39XRAg5SC8lHlidHHz+6ZEPvQBpVpCo/ONaLnOPo=; b=NyioUtV//QzixC42phEy+wVATGsWmMD0Z0y1Jl+NqIG8MrwSOkHZFqD7 La0Lh9Hsq6efud9zXcmZ9RGClC8QQzZa06kFFQEcE2z54IqStmt/hrAyo w+4NMLxAdk+qxJGCAbv3hLM2wciVIdD7fzIQqhqeRpYC7D9YDW1wxfLnK MbATHrrNZx7hB0lhXsvfzoJ+qepjrwsNc5uTXZ9ubzAhDHjGmYaGFBlNC Q+kythsWnOcgBQKOf3CNebqliSfQlPqzX1jnxxAXj6Yd0Mtt7XLf1ytrY jl2nEcoNC7/cL3xlf7O8yGtJmBvgDYFfHgsC91OsqV7GV2EEA/2N/3DwP g==; X-IronPort-AV: E=McAfee;i="6500,9779,10545"; a="313591663" X-IronPort-AV: E=Sophos;i="5.96,200,1665471600"; d="scan'208";a="313591663" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Nov 2022 09:04:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10545"; a="706864634" X-IronPort-AV: E=Sophos;i="5.96,200,1665471600"; d="scan'208";a="706864634" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga008.fm.intel.com with ESMTP; 28 Nov 2022 09:04:20 -0800 From: Xin Li To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, peterz@infradead.org, brgerst@gmail.com, chang.seok.bae@intel.com, jgross@suse.com Subject: [PATCH v5 5/5] x86/gsseg: use the LKGS instruction if available for load_gs_index() Date: Mon, 28 Nov 2022 08:40:28 -0800 Message-Id: <20221128164028.4570-6-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221128164028.4570-1-xin3.li@intel.com> References: <20221128164028.4570-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750760826775106200?= X-GMAIL-MSGID: =?utf-8?q?1750760826775106200?= From: "H. Peter Anvin (Intel)" The LKGS instruction atomically loads a segment descriptor into the %gs descriptor registers, *except* that %gs.base is unchanged, and the base is instead loaded into MSR_IA32_KERNEL_GS_BASE, which is exactly what we want this function to do. Signed-off-by: H. Peter Anvin (Intel) Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Brian Gerst Signed-off-by: Juergen Gross Signed-off-by: Xin Li --- Changes since v4: * Clear the LKGS feature from Xen PV guests (Juergen Gross). Changes since v3: * We want less ASM not more, thus keep local_irq_save/restore() inside native_load_gs_index() (Thomas Gleixner). * For paravirt enabled kernels, initialize pv_ops.cpu.load_gs_index to native_lkgs (Thomas Gleixner). Changes since v2: * Mark DI as input and output (+D) as in V1, since the exception handler modifies it (Brian Gerst). Changes since v1: * Use EX_TYPE_ZERO_REG instead of fixup code in the obsolete .fixup code section (Peter Zijlstra). * Add a comment that states the LKGS_DI macro will be repalced with "lkgs %di" once the binutils support the LKGS instruction (Peter Zijlstra). --- arch/x86/include/asm/gsseg.h | 33 +++++++++++++++++++++++++++++---- arch/x86/kernel/cpu/common.c | 1 + arch/x86/xen/enlighten_pv.c | 1 + 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/gsseg.h b/arch/x86/include/asm/gsseg.h index d15577c39e8d..ab6a595cea70 100644 --- a/arch/x86/include/asm/gsseg.h +++ b/arch/x86/include/asm/gsseg.h @@ -14,17 +14,42 @@ extern asmlinkage void asm_load_gs_index(u16 selector); +/* Replace with "lkgs %di" once binutils support LKGS instruction */ +#define LKGS_DI _ASM_BYTES(0xf2,0x0f,0x00,0xf7) + +static inline void native_lkgs(unsigned int selector) +{ + u16 sel = selector; + asm_inline volatile("1: " LKGS_DI + _ASM_EXTABLE_TYPE_REG(1b, 1b, EX_TYPE_ZERO_REG, %k[sel]) + : [sel] "+D" (sel)); +} + static inline void native_load_gs_index(unsigned int selector) { - unsigned long flags; + if (cpu_feature_enabled(X86_FEATURE_LKGS)) { + native_lkgs(selector); + } else { + unsigned long flags; - local_irq_save(flags); - asm_load_gs_index(selector); - local_irq_restore(flags); + local_irq_save(flags); + asm_load_gs_index(selector); + local_irq_restore(flags); + } } #endif /* CONFIG_X86_64 */ +static inline void __init lkgs_init(void) +{ +#ifdef CONFIG_PARAVIRT_XXL +#ifdef CONFIG_X86_64 + if (cpu_feature_enabled(X86_FEATURE_LKGS)) + pv_ops.cpu.load_gs_index = native_lkgs; +#endif +#endif +} + #ifndef CONFIG_PARAVIRT_XXL static inline void load_gs_index(unsigned int selector) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 3e508f239098..d6eb4f60b47d 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1939,6 +1939,7 @@ void __init identify_boot_cpu(void) setup_cr_pinning(); tsx_init(); + lkgs_init(); } void identify_secondary_cpu(struct cpuinfo_x86 *c) diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index 038da45f057a..c48a9061160e 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -276,6 +276,7 @@ static void __init xen_init_capabilities(void) setup_clear_cpu_cap(X86_FEATURE_ACC); setup_clear_cpu_cap(X86_FEATURE_X2APIC); setup_clear_cpu_cap(X86_FEATURE_SME); + setup_clear_cpu_cap(X86_FEATURE_LKGS); /* * Xen PV would need some work to support PCID: CR3 handling as well