From patchwork Mon Jan 16 14:25:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Zijlstra X-Patchwork-Id: 44200 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1232576wrn; Mon, 16 Jan 2023 06:54:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXuTGWEStrfLoARIaoG5l9NbnpwRzr45F742OjLEYZLZDNqiBi8CTndicFKamNtss1mqAR9p X-Received: by 2002:a05:6a20:690d:b0:b5:97de:d7e7 with SMTP id q13-20020a056a20690d00b000b597ded7e7mr48698410pzj.18.1673880861754; Mon, 16 Jan 2023 06:54:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673880861; cv=none; d=google.com; s=arc-20160816; b=zn0aqm6O/JAN7P+a8mjzT8wkMsIguxqE9NfcFMl51hy1VPITppYt2yjDYQ4azVoExM 1PHQVIJ6Ea7Yb8McMeop21yELmjIBt3E4Qje4i5NzcjxIht30DOaBa904hrTTa3ymvQx xvG5QhMl/1CFlzSOR8LxTdfK/1nyiKir5BrmqXyabrYebSIzByD+qHw126z+/QKsW/bU NWTxfmK/a5ED7q5eVLjIVuNbV531LeRTHIOwORiLoRfscTMAI4k8Ws76wn+jVPNxnzqs YtZhvVvG6KEF1jg9xOqxH4y5x0d23yy9AelS3kocL/esVWl3bPUouNxRNDb9Rn1/wTJs PrfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id:dkim-signature; bh=dtG3CCLzMA0i0qOsNCGAACCWIWjzH+RX76nYJr/7nUg=; b=KV7RTR3hVChvYyBul0MZ8OyQD3VUGn0+dcx7WIftVGBXQQtdaXsoZwiZpYnxm2zqL4 DqlXWCXgjXtFVTYA3TFKzlgIaH/7gvLNMcCVq2Zv+TrWB4wXY357XZfcF+ytob+Xhd0t KU7+reijNLRTbXqnCZZ6qUKFNEIGp0LG/pe+50QaT7d+YS4nXKUvQ2X3XyKfzDylk8Jf x8cVY8cpwbizJByv2SCA/yk8wmEioZf9QxEdjVBj1eKqIz4PWys6Dh2E084Q/Jmy6rkY 3eEKb5mXCSKY540jghui85gCuARbv/QnLOqdlBXnWAB9+fmWm2TbObpKqu6N0CfY03Tp hPEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=mNSQfQeU; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q8-20020a63cc48000000b0046b1dabcb34si30135426pgi.765.2023.01.16.06.54.09; Mon, 16 Jan 2023 06:54:21 -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=@infradead.org header.s=casper.20170209 header.b=mNSQfQeU; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232398AbjAPOxG (ORCPT + 99 others); Mon, 16 Jan 2023 09:53:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230218AbjAPOwN (ORCPT ); Mon, 16 Jan 2023 09:52:13 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 895D72BF1B for ; Mon, 16 Jan 2023 06:38:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:References: Subject:Cc:To:From:Date:Message-ID:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=dtG3CCLzMA0i0qOsNCGAACCWIWjzH+RX76nYJr/7nUg=; b=mNSQfQeUAAjFw9ESss496f+Z7Q u0TgyafjRhE1gQwftI2iBVWQ3NaSLG34VdbAWazXouiYsRdKyzqy1wML0X2573JOCsV/N0PK5k2F2 TPov7/LEGoLwGuZcybAwU9tHaa3wffyOD9zxSarAfZ29Q4WErfXs+qrs4jgpQMpEdyO9/ORvp95nX EjaMEymmS+cwIurns0c3wEq3uE17tL2K8Hwq/Ex3y3gpAT4bxe9pp5k86FtmXoW5UtC3/6pfTmVtZ 8qPTNYgKrdqtoTo1pP63NdYMrqwT3UhPTSsaXrAPfezN6rdi70FJ8sxMqiPPuMxRvDSFpPFtdzk0Q gXratnhg==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHQcT-008oZ6-SE; Mon, 16 Jan 2023 14:37:54 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id E016530073F; Mon, 16 Jan 2023 15:37:38 +0100 (CET) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id B816220B75F29; Mon, 16 Jan 2023 15:37:38 +0100 (CET) Message-ID: <20230116143645.768035056@infradead.org> User-Agent: quilt/0.66 Date: Mon, 16 Jan 2023 15:25:37 +0100 From: Peter Zijlstra To: x86@kernel.org, Joan Bruguera Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, Juergen Gross , "Rafael J. Wysocki" , xen-devel , Jan Beulich , Roger Pau Monne , Kees Cook , mark.rutland@arm.com, Andrew Cooper , =?utf-8?b?SsO2cmcgUsO2ZGVs?= , "H. Peter Anvin" Subject: [PATCH v2 4/7] x86/power: Inline write_cr[04]() References: <20230116142533.905102512@infradead.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,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?1755191298758443345?= X-GMAIL-MSGID: =?utf-8?q?1755191298758443345?= Since we can't do CALL/RET until GS is restored and CR[04] pinning is of dubious value in this code path, simply write the stored values. Fixes: e81dc127ef69 ("x86/callthunks: Add call patching for call depth tracking") Reported-by: Joan Bruguera Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Kees Cook --- arch/x86/power/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu.c @@ -208,11 +208,11 @@ static void notrace __restore_processor_ #else /* CONFIG X86_64 */ native_wrmsrl(MSR_EFER, ctxt->efer); - native_write_cr4(ctxt->cr4); + asm volatile("mov %0,%%cr4": "+r" (ctxt->cr4) : : "memory"); #endif native_write_cr3(ctxt->cr3); native_write_cr2(ctxt->cr2); - native_write_cr0(ctxt->cr0); + asm volatile("mov %0,%%cr0": "+r" (ctxt->cr0) : : "memory"); /* Restore the IDT. */ native_load_idt(&ctxt->idt);