Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp2345486ybz; Thu, 23 Apr 2020 16:26:35 -0700 (PDT) X-Google-Smtp-Source: APiQypJ1thEZMFZGzMwuVoj83mzNX8LJw661I+aCutPZQEEaTi3wJexLCJyqHitsaXcAaSzetO1N X-Received: by 2002:a17:906:81d7:: with SMTP id e23mr4352177ejx.309.1587684395472; Thu, 23 Apr 2020 16:26:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587684395; cv=none; d=google.com; s=arc-20160816; b=ahUJGSmovhjqY60ZvBa4NjTwrqVz1s0PcNOYD3Y58PIRvagR7WaihtvBWXwhLFHsl/ 5O27Ig28nsfR4wyScxBH62VDYqWCoBrWSoWgMtMU5Oo7UMIdZbownl2KTQ+OnH2Kbuzl owyjitM8yyEklWcXBdyuYyeZsgP3CAXYnJkVA914HUa9o+Hmfn5v1VEpWwI99Ji0n325 kv4GHe1vLpjroEjR6TDOHvlGvDrzcCfRMOeSmBfH2H4uJ/D9yQF0k8SEKc8dunl6qRnd xJhb84s3JSPzfMTFoFvFfhl4KnLU1danoyUFKD3FJgJVaKvt+Ua+cwBHm8i2lEwtvJWD /4rA== 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=BGYoKVux9WYfg6K0eNKzT8HJA3V17TIGZQ52OBFarEw=; b=FH11088Ev18mPiqQP/g4OncfPiHm52ShF4Md4A0ExS65r0DfKEcGjD0ncwhRF/C3EC O09yz9S4m2lXtKq+9jjUb16xUgYh7LMouCYqHAJnVfgo8fOgmwdd7Div8oiVBt9LfSA6 OHWeTSmj/Eh898JlRZ0m260a9KBy4AmP2fDu7GgvDBDR+FHJ1SJRSZrwpAkvC8eTNCSL RC7dH8fHe0zb/UkKwmX2AUH0QNAkc/VwCHlv9/A6KuKYjOMJVu788wKIVuWbRaqe09bM NODNPpTAXByVkKkEKgY23+JY/PmD0R3ANvLb6m0ELEp85DThw/8D7Zu7GH7PNTj7FEbw QA7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="CtbcQS/E"; 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 g19si2102317edh.59.2020.04.23.16.26.12; Thu, 23 Apr 2020 16:26:35 -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="CtbcQS/E"; 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 S1729310AbgDWXW7 (ORCPT + 99 others); Thu, 23 Apr 2020 19:22:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:59164 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728230AbgDWXW1 (ORCPT ); Thu, 23 Apr 2020 19:22:27 -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 CE34521927; Thu, 23 Apr 2020 23:22:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587684147; bh=jBoFrACXx4Px8cBOPCtQwbLFMFIbg2WXxMawmMD5064=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CtbcQS/E4AkBtXiYomGS5ZciYcOq0l795OT/a6kcqifLdk2K7/eIQF5IJ2EwjUshS /nDlk9ZQ4BN7eO/GcDHfCBALSzN/ki0OK295Uy70McmVQk750OT7pj9Rn6KUnovm1F oL3gXfyySPWQqMqwjIsO6XO4lHl5xVNUBaLMe5Jk= From: Sasha Levin To: linux-kernel@vger.kernel.org, tglx@linutronix.de, bp@alien8.de, luto@kernel.org Cc: hpa@zytor.com, dave.hansen@intel.com, tony.luck@intel.com, ak@linux.intel.com, ravi.v.shankar@intel.com, chang.seok.bae@intel.com, Sasha Levin Subject: [PATCH v10 11/18] x86/fsgsbase/64: Use FSGSBASE in switch_to() if available Date: Thu, 23 Apr 2020 19:22:00 -0400 Message-Id: <20200423232207.5797-12-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200423232207.5797-1-sashal@kernel.org> References: <20200423232207.5797-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: Andy Lutomirski With the new FSGSBASE instructions, FS/GS base can be efficiently read and written in __switch_to(). Use that capability to preserve the full state. This will enable user code to do whatever it wants with the new instructions without any kernel-induced gotchas. (There can still be architectural gotchas: movl %gs,%eax; movl %eax,%gs may change GS base if WRGSBASE was used, but users are expected to read the CPU manual before doing things like that.) This is a considerable speedup. It seems to save about 100 cycles per context switch compared to the baseline 4.6-rc1 behavior on a Skylake laptop. [ chang: 5~10% performance improvements were seen by a context switch benchmark that ran threads with different FS/GS base values (to the baseline 4.16). ] Signed-off-by: Andy Lutomirski Signed-off-by: Chang S. Bae Reviewed-by: Tony Luck Cc: Thomas Gleixner Cc: Borislav Petkov Cc: Andy Lutomirski Cc: H. Peter Anvin Cc: Dave Hansen Cc: Tony Luck Cc: Andi Kleen Signed-off-by: Sasha Levin --- arch/x86/kernel/process_64.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index aaa65f284b9b9..e066750be89a0 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -199,8 +199,18 @@ static __always_inline void save_fsgs(struct task_struct *task) { savesegment(fs, task->thread.fsindex); savesegment(gs, task->thread.gsindex); - save_base_legacy(task, task->thread.fsindex, FS); - save_base_legacy(task, task->thread.gsindex, GS); + if (static_cpu_has(X86_FEATURE_FSGSBASE)) { + /* + * If FSGSBASE is enabled, we can't make any useful guesses + * about the base, and user code expects us to save the current + * value. Fortunately, reading the base directly is efficient. + */ + task->thread.fsbase = rdfsbase(); + task->thread.gsbase = x86_gsbase_read_cpu_inactive(); + } else { + save_base_legacy(task, task->thread.fsindex, FS); + save_base_legacy(task, task->thread.gsindex, GS); + } } #if IS_ENABLED(CONFIG_KVM) @@ -279,10 +289,22 @@ static __always_inline void load_seg_legacy(unsigned short prev_index, static __always_inline void x86_fsgsbase_load(struct thread_struct *prev, struct thread_struct *next) { - load_seg_legacy(prev->fsindex, prev->fsbase, - next->fsindex, next->fsbase, FS); - load_seg_legacy(prev->gsindex, prev->gsbase, - next->gsindex, next->gsbase, GS); + if (static_cpu_has(X86_FEATURE_FSGSBASE)) { + /* Update the FS and GS selectors if they could have changed. */ + if (unlikely(prev->fsindex || next->fsindex)) + loadseg(FS, next->fsindex); + if (unlikely(prev->gsindex || next->gsindex)) + loadseg(GS, next->gsindex); + + /* Update the bases. */ + wrfsbase(next->fsbase); + x86_gsbase_write_cpu_inactive(next->gsbase); + } else { + load_seg_legacy(prev->fsindex, prev->fsbase, + next->fsindex, next->fsbase, FS); + load_seg_legacy(prev->gsindex, prev->gsbase, + next->gsindex, next->gsbase, GS); + } } static unsigned long x86_fsgsbase_read_task(struct task_struct *task, -- 2.20.1