From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9DC366BFCF for ; Fri, 17 May 2024 14:20:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.9 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715955605; cv=none; b=hyauwM14qr+l5AiNb8NPMt1YWJc06uhsQfbimOZrJg86FdOahjtPd7pRr3A8fw2MIkAdDzo1qpj6q0fwOI6rlBHMBcNt+sg0EvUoukOck1jknBAQ/Ia9y4aaX3o2ovLUFzvXvHn7bseYzzALlalOxkEvyxqkyLeU1onyD97OT+U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715955605; c=relaxed/simple; bh=mwZWrFqPlAATgrpluzFmNP8LOZ2SkfC+w1PDY7N0GkI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qx2ozMTpsxzBHoluci1QArGcT/M/6Hdxp0lgdANCotnkUonREje2zYkqLCITlvw4nO9OHm0HFXYx0Layd4yPrMD+GrvQSOhgIEaMYSBquPEN2A95Whxiih0FpWa/gTwCxOMGiyj6dXJ34GAvaEGuWw0U464L59DyZ4d6Aj5iPl4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.helo=mgamail.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=FMcrkSk1; arc=none smtp.client-ip=192.198.163.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.helo=mgamail.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="FMcrkSk1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715955604; x=1747491604; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mwZWrFqPlAATgrpluzFmNP8LOZ2SkfC+w1PDY7N0GkI=; b=FMcrkSk1J2WFBqxKLBnsTFii3Jmrzh/KgZcMjPjSCqWUWpYG3lS9z5nb mW5bzCMnTZtjCSTcHS/rrXZb9c3u2opqpxSqjkrvHtt6Oag09BkWQyiqD luJ1h8vD7T8kqB7Iqtm0i1tK2S0XaQ6OTpHFqK1cgvrpd8Xv7wHUf+Aof oqUClm56+yqVsWKgBisNVX1gDf/HhdXwFTuKnirwZrAhG3Oei7SAl3X89 Vgl1JIFUzNkbAKpwdCu9ueRxMRTKndeSHKJcP0GGMz73yaebNRUNaSicK CR0UsFjppBAf37TXJP2ao+AKOb+jyRtJf66cajBmRCYNRZ55b0h8pzOrC w==; X-CSE-ConnectionGUID: L7dlTepHQriY/Q8HG2M8YQ== X-CSE-MsgGUID: wdDGA1B8Rp29ICLesi9aZg== X-IronPort-AV: E=McAfee;i="6600,9927,11075"; a="22808662" X-IronPort-AV: E=Sophos;i="6.08,167,1712646000"; d="scan'208";a="22808662" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2024 07:20:00 -0700 X-CSE-ConnectionGUID: u/UyLr5SQ0md6MvEb5xcUw== X-CSE-MsgGUID: Lot0qZVdQp6wzxYOJB6H/Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,167,1712646000"; d="scan'208";a="69253383" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa001.jf.intel.com with ESMTP; 17 May 2024 07:19:56 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id EEF7CD0D; Fri, 17 May 2024 17:19:49 +0300 (EEST) From: "Kirill A. Shutemov" To: Sean Christopherson , Paolo Bonzini , Dave Hansen , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Josh Poimboeuf , Peter Zijlstra Cc: linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 07/20] x86/tdx: Convert CPUID handling to use new TDVMCALL_4() Date: Fri, 17 May 2024 17:19:25 +0300 Message-ID: <20240517141938.4177174-8-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240517141938.4177174-1-kirill.shutemov@linux.intel.com> References: <20240517141938.4177174-1-kirill.shutemov@linux.intel.com> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use newly introduced TDVMCALL_4() instead of __tdx_hypercall() to handle CPUID instruction emulation. It cuts code bloat substantially: Function old new delta tdx_handle_virt_exception 1819 1747 -72 Signed-off-by: Kirill A. Shutemov --- arch/x86/coco/tdx/tdx.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c index f59a2b3500db..c436cab355e0 100644 --- a/arch/x86/coco/tdx/tdx.c +++ b/arch/x86/coco/tdx/tdx.c @@ -414,13 +414,6 @@ static int write_msr(struct pt_regs *regs, struct ve_info *ve) static int handle_cpuid(struct pt_regs *regs, struct ve_info *ve) { - struct tdx_module_args args = { - .r10 = TDX_HYPERCALL_STANDARD, - .r11 = hcall_func(EXIT_REASON_CPUID), - .r12 = regs->ax, - .r13 = regs->cx, - }; - /* * Only allow VMM to control range reserved for hypervisor * communication. @@ -438,19 +431,10 @@ static int handle_cpuid(struct pt_regs *regs, struct ve_info *ve) * ABI can be found in TDX Guest-Host-Communication Interface * (GHCI), section titled "VP.VMCALL". */ - if (__tdx_hypercall(&args)) + if (TDVMCALL_4(EXIT_REASON_CPUID, regs->ax, regs->cx, 0, 0, + regs->ax, regs->bx, regs->cx, regs->dx)) return -EIO; - /* - * As per TDX GHCI CPUID ABI, r12-r15 registers contain contents of - * EAX, EBX, ECX, EDX registers after the CPUID instruction execution. - * So copy the register contents back to pt_regs. - */ - regs->ax = args.r12; - regs->bx = args.r13; - regs->cx = args.r14; - regs->dx = args.r15; - return ve_instr_len(ve); } -- 2.43.0