Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp718719ybm; Thu, 28 May 2020 13:21:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSaZ35TKmGzTfvkYMEbwp9hY9P57cM+13JEGr4flcDvFTuuId8p+RE3var938A5DDcH18F X-Received: by 2002:a05:6402:1d2a:: with SMTP id dh10mr4827274edb.276.1590697292770; Thu, 28 May 2020 13:21:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590697292; cv=none; d=google.com; s=arc-20160816; b=o0yBoDUqhdWaNShEEvTNWVQwWG3e5W121rfB93loIWDl0tcJFCIhdp/XGEBml6odpN QNagUkvdsgGwShM39uT9aE+X72sfdD93WCBFtJZHyiU2fPerAUT/d+TjCpGm88gjJBm6 C6rSPR+7ufXmLJc7chOcuTdmXl2VTDi8iCf/kd9NwapBGESVjAuRtK140VzIuMd1Y5wO /qXvEJaY9RAY+QePWBy8ukNrVw0+7Hb6sRVasbl2IoQNDqq4YuxnFg1wvspzWi675bDX OYOcOdVpCOpdJkbDZQoaPlQXBHEJ2Qo8IrGnMyhJw0MRi+TPNdDCiey1iZVEfoB3BOho eV4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Hf6TnmwNBI/t3hRNg7/2R1UX5UG79UdluLzeRddqT5Y=; b=Uo9TVs2pm3aJukQbPFCeZR2WRVUkywHKkJ8dH4i3920EUruCgzYBG9fYhxDJvb1Ib+ MyMKBnB6pJExkZhuL9mmLqTdeYuiEw/ewvKxCA0ZPBJ+KKbP5OZWJlCAt42Fyp/lHOSz ZCzkf25mTm8XaUWvu3NbSTVQ9pfeVX1GDQZuACqW2UFVA6g/7HB3sz9u86djCEeed97K t/bmecx3d0y4cCeSTruGJseisiKVFJg8mE8ADICtNUC/yPjBr4LkILwolVfN90/YitH4 umcZDrjVGuxZkIxR3x6sM3vhZRMZsj6K8a7QMBqw9EiIzpgLTJaw0lOrbWe+HlgU3BFl Ueig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cnHmM4FT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q26si4580740edc.130.2020.05.28.13.21.09; Thu, 28 May 2020 13:21:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cnHmM4FT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407194AbgE1UQ0 (ORCPT + 99 others); Thu, 28 May 2020 16:16:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:42050 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407032AbgE1UOc (ORCPT ); Thu, 28 May 2020 16:14:32 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 01E03214D8; Thu, 28 May 2020 20:14:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590696871; bh=5mDtRWpyWxKMTePmfeN0asoxKgTNM9ztJLTtTwhGIo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cnHmM4FTaWsXjCrkbno8k0NCBI6dekbv9unTayikUAyymZ7Zn8WYRT2X4FfRyZhSv d+yvasf+KZk184JvcMFbuspsBcIIgwp3KC7aHUGmY1gzlPEmXfeBSl3Zljtp4Bp6Za suTB6T4A1SPnLaXrAjqkvg5KrXSq5npb78bLnKS8= From: Sasha Levin To: tglx@linutronix.de, luto@kernel.org, ak@linux.intel.com Cc: corbet@lwn.net, mingo@redhat.com, bp@alien8.de, x86@kernel.org, shuah@kernel.org, gregkh@linuxfoundation.org, tony.luck@intel.com, chang.seok.bae@intel.com, dave.hansen@linux.intel.com, peterz@infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, jarkko.sakkinen@linux.intel.com, "H . Peter Anvin" , Ravi Shankar , Sasha Levin Subject: [PATCH v13 10/16] x86/entry/64: Introduce the FIND_PERCPU_BASE macro Date: Thu, 28 May 2020 16:13:56 -0400 Message-Id: <20200528201402.1708239-11-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200528201402.1708239-1-sashal@kernel.org> References: <20200528201402.1708239-1-sashal@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Chang S. Bae" GSBASE is used to find per-CPU data in the kernel. But when GSBASE is unknown, the per-CPU base can be found from the per_cpu_offset table with a CPU NR. The CPU NR is extracted from the limit field of the CPUNODE entry in GDT, or by the RDPID instruction. This is a prerequisite for using FSGSBASE in the low level entry code. Also, add the GAS-compatible RDPID macro as binutils 2.21 do not support it. Support is added in version 2.27. [ tglx: Massaged changelog ] Suggested-by: H. Peter Anvin Signed-off-by: Chang S. Bae Signed-off-by: Thomas Gleixner Cc: Andy Lutomirski Cc: Andi Kleen Cc: Ravi Shankar Cc: Dave Hansen Link: https://lkml.kernel.org/r/1557309753-24073-12-git-send-email-chang.seok.bae@intel.com Signed-off-by: Sasha Levin --- arch/x86/entry/calling.h | 34 ++++++++++++++++++++++++++++++++++ arch/x86/include/asm/inst.h | 15 +++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/arch/x86/entry/calling.h b/arch/x86/entry/calling.h index 1c7f13bb6728..1b95cdc19b18 100644 --- a/arch/x86/entry/calling.h +++ b/arch/x86/entry/calling.h @@ -6,6 +6,7 @@ #include #include #include +#include /* @@ -349,6 +350,39 @@ For 32-bit we have the following conventions - kernel is built with #endif .endm +#ifdef CONFIG_SMP + +/* + * CPU/node NR is loaded from the limit (size) field of a special segment + * descriptor entry in GDT. + */ +.macro LOAD_CPU_AND_NODE_SEG_LIMIT reg:req + movq $__CPUNODE_SEG, \reg + lsl \reg, \reg +.endm + +/* + * Fetch the per-CPU GSBASE value for this processor and put it in @reg. + * We normally use %gs for accessing per-CPU data, but we are setting up + * %gs here and obviously can not use %gs itself to access per-CPU data. + */ +.macro GET_PERCPU_BASE reg:req + ALTERNATIVE \ + "LOAD_CPU_AND_NODE_SEG_LIMIT \reg", \ + "RDPID \reg", \ + X86_FEATURE_RDPID + andq $VDSO_CPUNODE_MASK, \reg + movq __per_cpu_offset(, \reg, 8), \reg +.endm + +#else + +.macro GET_PERCPU_BASE reg:req + movq pcpu_unit_offsets(%rip), \reg +.endm + +#endif /* CONFIG_SMP */ + /* * This does 'call enter_from_user_mode' unless we can avoid it based on * kernel config or using the static jump infrastructure. diff --git a/arch/x86/include/asm/inst.h b/arch/x86/include/asm/inst.h index f5a796da07f8..d063841a17e3 100644 --- a/arch/x86/include/asm/inst.h +++ b/arch/x86/include/asm/inst.h @@ -306,6 +306,21 @@ .endif MODRM 0xc0 movq_r64_xmm_opd1 movq_r64_xmm_opd2 .endm + +.macro RDPID opd + REG_TYPE rdpid_opd_type \opd + .if rdpid_opd_type == REG_TYPE_R64 + R64_NUM rdpid_opd \opd + .else + R32_NUM rdpid_opd \opd + .endif + .byte 0xf3 + .if rdpid_opd > 7 + PFX_REX rdpid_opd 0 + .endif + .byte 0x0f, 0xc7 + MODRM 0xc0 rdpid_opd 0x7 +.endm #endif #endif -- 2.25.1