From patchwork Tue Sep 12 15:32:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 139554 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp318167vqi; Thu, 14 Sep 2023 05:42:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFnOaIhBDBkZbgbuXmPB+tjsPA8jHFT3cIego3gdcSpF5nDwdFidbzqpUjwCvaozgFwDAb9 X-Received: by 2002:a17:902:c40d:b0:1bc:3944:9391 with SMTP id k13-20020a170902c40d00b001bc39449391mr6605206plk.25.1694695321630; Thu, 14 Sep 2023 05:42:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694695321; cv=none; d=google.com; s=arc-20160816; b=VgV7Ybun4ffm2osLGMbLNtFBKanL5vtR1Eg0qtfgxb6xZ40P3lZ+miaMc7C3zQfv15 nKWPYj3kFvW88cn6IN9GZHQTw3hfITAvpWZYnqoLK8e8xu6bfgy06yGYCJsm39UHSXjH 5875mJPmap5xUGj3phfA/Tr1Voz6RoREiEaPdwppa6G0ih6EzizOFMm+o1cR0EpxNzSl UTr53nBgnB3ztY6BSJYHbKSvfVREEKfzWga6mzzeMXrMXSxqP3MMDUfsoWUyyDN0rXBc /T03WBrmY1qWCSxJw1AWemRLbuetDFn0+NzCCt/AyIDNQSHRl4DZn1faDYiZqpHjt42b 9fyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=MdHqwe5s0tlMo1gtm11NLrpTwCjp+Y3BpZCJRKfsNFI=; fh=f0EoIZd3juvl0jlL+5iA1LiDEymQt1SJXsL76v1TqdI=; b=YBFN9mnNMnykHpPRGu9Hgs1OSC2LBZ0UYzBs+eN4OToKaiTNQ0PnuBpT1ln5WUohLJ NWZY/joLiGPTsHywvcRnWKP2R4oA4IoF+BYQtSc6FVh/azsk8m2iSC9GV5td9Nh2XVZF 1nWhWZWt3BRwGBBa1opRggDI+cVv2PN/B15Bv+8YT2SKavCzFPhHdb/DT6kvfU6WmCIr 3ppcRxSWwcYv4X2ShcM4X0+F2TnKAhce83qEJHOuNPumxUUuDinKdpCpxLf8aZzuvVDj 9Yl6Rn92kgnnbB5EqqzHB4PYSGbLWiDz0EoCzMeaigEJZ1H9KMtl4dN3hn8Ht5PCoKQ5 mBfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=wHWH4jjF; dkim=neutral (no key) header.i=@linutronix.de header.b=WfIV75LO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id o5-20020a17090323c500b001b8c4168e20si1613439plh.58.2023.09.14.05.42.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 05:42:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=wHWH4jjF; dkim=neutral (no key) header.i=@linutronix.de header.b=WfIV75LO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B31E58052710; Tue, 12 Sep 2023 08:32:54 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236513AbjILPcj (ORCPT + 37 others); Tue, 12 Sep 2023 11:32:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236416AbjILPcK (ORCPT ); Tue, 12 Sep 2023 11:32:10 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14B6810E5; Tue, 12 Sep 2023 08:32:07 -0700 (PDT) Date: Tue, 12 Sep 2023 15:32:04 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1694532725; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MdHqwe5s0tlMo1gtm11NLrpTwCjp+Y3BpZCJRKfsNFI=; b=wHWH4jjFNd/SIYHZWftOBWpeS4f7NiXxPR/O+tyCYLXUP1+j5hCLKgkDKPeD1AC5gWbqLJ s0XltDnX1NlGBoBjF+i8Qy8v/J9IpwV5BMPuQEl3vteGTrI90C3dNaiq98L9QIuprIuynj HMgugUPCqPUe2KS4mYGRLOK/rpENiXevCwGOMB3mciAMzNsdaoxEFjV0X1xoX25q4wm1e2 RH7LwsXkqw7stHBnBOzhh1/VHjNNt0zG+TsQ1lDFwzJhx66x2IlcbuTj4jItM+nvwPPk9V A0YLWK9iA7yWa+GllTwTG8NyfDtmqxcjFMFSwkFcJT8shZv2X1Dq4CZmYNc3Tg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1694532725; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MdHqwe5s0tlMo1gtm11NLrpTwCjp+Y3BpZCJRKfsNFI=; b=WfIV75LOYRMl/I7eZl5pBI4jtxoyhLyF1MRqsc8mpkY/llw9+t1vj2Dnf9UFsCNgk1FVcc VDPBo/36DbDHb3AQ== From: "tip-bot2 for Kai Huang" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/tdx] x86/tdx: Zero out the missing RSI in TDX_HYPERCALL macro Cc: Kai Huang , Dave Hansen , Kuppuswamy Sathyanarayanan , "Kirill A. Shutemov" , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169453272495.27769.4055377041051736661.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 12 Sep 2023 08:32:54 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777016841696275038 X-GMAIL-MSGID: 1777016841696275038 The following commit has been merged into the x86/tdx branch of tip: Commit-ID: 5d092b66119d774853cc9308522620299048a662 Gitweb: https://git.kernel.org/tip/5d092b66119d774853cc9308522620299048a662 Author: Kai Huang AuthorDate: Tue, 15 Aug 2023 23:01:55 +12:00 Committer: Dave Hansen CommitterDate: Mon, 11 Sep 2023 16:31:52 -07:00 x86/tdx: Zero out the missing RSI in TDX_HYPERCALL macro In the TDX_HYPERCALL asm, after the TDCALL instruction returns from the untrusted VMM, the registers that the TDX guest shares to the VMM need to be cleared to avoid speculative execution of VMM-provided values. RSI is specified in the bitmap of those registers, but it is missing when zeroing out those registers in the current TDX_HYPERCALL. It was there when it was originally added in commit 752d13305c78 ("x86/tdx: Expand __tdx_hypercall() to handle more arguments"), but was later removed in commit 1e70c680375a ("x86/tdx: Do not corrupt frame-pointer in __tdx_hypercall()"), which was correct because %rsi is later restored in the "pop %rsi". However a later commit 7a3a401874be ("x86/tdx: Drop flags from __tdx_hypercall()") removed that "pop %rsi" but forgot to add the "xor %rsi, %rsi" back. Fix by adding it back. Fixes: 7a3a401874be ("x86/tdx: Drop flags from __tdx_hypercall()") Signed-off-by: Kai Huang Signed-off-by: Dave Hansen Reviewed-by: Kuppuswamy Sathyanarayanan Reviewed-by: Kirill A. Shutemov Acked-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/all/e7d1157074a0b45d34564d5f17f3e0ffee8115e9.1692096753.git.kai.huang%40intel.com --- arch/x86/coco/tdx/tdcall.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/coco/tdx/tdcall.S b/arch/x86/coco/tdx/tdcall.S index b193c0a..2eca5f4 100644 --- a/arch/x86/coco/tdx/tdcall.S +++ b/arch/x86/coco/tdx/tdcall.S @@ -195,6 +195,7 @@ SYM_FUNC_END(__tdx_module_call) xor %r10d, %r10d xor %r11d, %r11d xor %rdi, %rdi + xor %rsi, %rsi xor %rdx, %rdx /* Restore callee-saved GPRs as mandated by the x86_64 ABI */