Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp716082ybm; Thu, 28 May 2020 13:17:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbYcTwe/xdJsMd9HFwWDzD/INhASVK2HkintjJXKVIPR0/cuFQ8n+s1sKpxLvP6kUazn45 X-Received: by 2002:aa7:d787:: with SMTP id s7mr5064535edq.104.1590697051138; Thu, 28 May 2020 13:17:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590697051; cv=none; d=google.com; s=arc-20160816; b=f54aKbImqbw5TLb1S0gfIUqvxtcj1BKiWkxisKl2+rGlBtO/4dWeoKF+BlNHb4kKO1 zS+I1NErQLQdEulxdIoX+qMgDy88VgGAWgb+ir4fd/JuVAtkxHnUjn/j+k+Dnriixvnr v67D4jaA+hfv8+3Ds9L1VVLcFpER4/y3QvGqJzyVWrTOwBcC5771vxfjDi/KZ+mbmZG4 7Bwu7nGVJDd/zv5wix4fYE7tU2EAeqk9QnZmAdtJn1v7G+6d0/4nrNEMG7yqu5zwMf01 8XeuAodieX7byq5gJAYIBPU/fNkgtlTsxdmyLkmvIrditQ0j6P9KgNp5KyIgmQm1clIb xcng== 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=HxfrZBtLF6YYSf3puFMcJOYao2bYjCPwbW+WfN+lWn8=; b=rQh0aXyDy2AbGMALuQSxV4NXK7cI3PDoJfNfLYrGMWiC9F5pY6tT8dLu6L2AUwFVmk D+7EUmOU/WPAX+CrW3Rmxf92f9taHV/3qmRbbwDwIxNFTYg8RIE72+U1OQyGchajRqbO ctn1nMSzHDUzbmxBAdZcn/4h4iilRalJZJilvUBkDiXMPFOgolJA9g3KgNg1mhjpsylW b/X2giqo6qaABy9jFkq0BJuu8WIziWeRaDdS+QoxZ3Kp5wc8Nuiw1r4aeMd7I1N7d5bz flfwn2/PKMASsjt7eEMqgZP8hOEwUd6TA8liHRBkiyRNGDNcUqQ9TE3Gt3W5aLcivpgD Jsfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=k4AEdmZm; 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 rh10si4283982ejb.678.2020.05.28.13.17.07; Thu, 28 May 2020 13:17:31 -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=k4AEdmZm; 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 S2407066AbgE1UOq (ORCPT + 99 others); Thu, 28 May 2020 16:14:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:41870 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407019AbgE1UO0 (ORCPT ); Thu, 28 May 2020 16:14:26 -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 EE06E2088E; Thu, 28 May 2020 20:14:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590696865; bh=Cbug4Zw6pLdPJMyM6ewVPi8za9fxR3JM1cojC9EnM+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k4AEdmZm0JNgL/s0oKV0nM8NQEtvV6FVP+zpgtOHyGsyffMn6AxwzOQXx0Qhl5raN rQdeD3rlf9SHPYNeGSHLlkQLrUSO5SQaJKvouupTtButX4L8jUewo3SCzNZMTMx2eJ a+dSGyhGVU/1cRPAohlORhLGnA1RlgocBEFGsmEs= 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 07/16] x86/process/64: Use FSGSBASE instructions on thread copy and ptrace Date: Thu, 28 May 2020 16:13:53 -0400 Message-Id: <20200528201402.1708239-8-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" When FSGSBASE is enabled, copying threads and reading fsbase and gsbase using ptrace must read the actual values. When copying a thread, use save_fsgs() and copy the saved values. For ptrace, the bases must be read from memory regardless of the selector if FSGSBASE is enabled. [ tglx: Invoke __rdgsbase_inactive() with interrupts disabled ] [ luto: Massage changelog ] Suggested-by: Andy Lutomirski Signed-off-by: Chang S. Bae Signed-off-by: Thomas Gleixner Cc: "H . Peter Anvin" Cc: Andi Kleen Cc: Ravi Shankar Cc: H. Peter Anvin Link: https://lkml.kernel.org/r/1557309753-24073-9-git-send-email-chang.seok.bae@intel.com Signed-off-by: Sasha Levin --- arch/x86/kernel/process.c | 10 ++++++---- arch/x86/kernel/process_64.c | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 9da70b279dad..0264d9bb8991 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -140,10 +140,12 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long sp, memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps)); #ifdef CONFIG_X86_64 - savesegment(gs, p->thread.gsindex); - p->thread.gsbase = p->thread.gsindex ? 0 : current->thread.gsbase; - savesegment(fs, p->thread.fsindex); - p->thread.fsbase = p->thread.fsindex ? 0 : current->thread.fsbase; + current_save_fsgs(); + p->thread.fsindex = current->thread.fsindex; + p->thread.fsbase = current->thread.fsbase; + p->thread.gsindex = current->thread.gsindex; + p->thread.gsbase = current->thread.gsbase; + savesegment(es, p->thread.es); savesegment(ds, p->thread.ds); #else diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index aefb30bc56bc..0bcb48a1264a 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -423,7 +423,8 @@ unsigned long x86_fsbase_read_task(struct task_struct *task) if (task == current) fsbase = x86_fsbase_read_cpu(); - else if (task->thread.fsindex == 0) + else if (static_cpu_has(X86_FEATURE_FSGSBASE) || + (task->thread.fsindex == 0)) fsbase = task->thread.fsbase; else fsbase = x86_fsgsbase_read_task(task, task->thread.fsindex); @@ -437,7 +438,8 @@ unsigned long x86_gsbase_read_task(struct task_struct *task) if (task == current) gsbase = x86_gsbase_read_cpu_inactive(); - else if (task->thread.gsindex == 0) + else if (static_cpu_has(X86_FEATURE_FSGSBASE) || + (task->thread.gsindex == 0)) gsbase = task->thread.gsbase; else gsbase = x86_fsgsbase_read_task(task, task->thread.gsindex); -- 2.25.1