Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp205661pxf; Wed, 31 Mar 2021 21:54:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweJV4VOAVUpZBCfvo6To3f8K4BmyZCCRA2ICGCQpS9t5qDjm61UhFx4wIBSe2LTfjB46xi X-Received: by 2002:a05:6402:31b7:: with SMTP id dj23mr7871041edb.245.1617252858313; Wed, 31 Mar 2021 21:54:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617252858; cv=none; d=google.com; s=arc-20160816; b=pO+NVJ+NPc8h0KDwa+59hfcY9qEi5tgmnOanCfq4ENYZYI4oK7EPspmJ1VadI9jRpF UhAA0mAnbinrYw5mBtxfZRFraIvBbwe+cPJ1frpj4AGSTCi5Uz7jISFjgL/tkv9nNdej J2dn+FPszJEtdHJQn4dXgZZMu2Ru/haof4zory+h+RD+UUZiArAC67T+5zrkqhwrLYTE 87/9tt+fdZbQoDHIb0nJblpRuWrf+vSRx0z69hO7+60Ft6pSh/4nEyKeLF85eiat/teb +duAi1agX9ng59/AMwG3cedsb1K5m0VDIawAnidJX/5570ljXRuRX/BwmK/wZB0V8Ynu zCqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=arz+4jX60iEtCxhw3ihyTfW6ZcuW2hawNaBP5nGyusY=; b=z3UaTAtoUyMvOUy4qlwBcmO6Y8t+Uum0ebSeLRY2rBZQ026KNnaf7gvcpxEFFFokpE j7O+yVSVB1lo7oShXAccYrfMEt5T3h0+KCB+wGIK5IdCAk+l2sXp92iVxNOXn3wbwk7A NZG02KZ3nan6vyZiwYMUKdgmjggULhGHJ3pSgY+XBnLs+g2IU9rrjdqeD/eLCh1WaQLE ib6Px+q8ehWvFl47WbADWQxOPBTHNfUBO2eJsz42ClUAUp8FF81I1jivSUdDhacfvDB/ TpdWTVyyOiW8lN/1foOdq1B9Ey+8F4qDpxY+IaSH8mM3og8msi4yjzsEMzrbFhLnRHBV RM7w== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id da5si3992260edb.565.2021.03.31.21.53.55; Wed, 31 Mar 2021 21:54:18 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230073AbhDAEwk (ORCPT + 99 others); Thu, 1 Apr 2021 00:52:40 -0400 Received: from mga09.intel.com ([134.134.136.24]:58121 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229850AbhDAEwi (ORCPT ); Thu, 1 Apr 2021 00:52:38 -0400 IronPort-SDR: Q82hAnI764AJRElUUeHeqvKbM4X4D50f2MNnWXaarukMH0fP3bLtqQoBEls/w+EdR78T909Y9P jVpGAOP6hhHw== X-IronPort-AV: E=McAfee;i="6000,8403,9940"; a="192251908" X-IronPort-AV: E=Sophos;i="5.81,295,1610438400"; d="scan'208";a="192251908" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2021 21:52:02 -0700 IronPort-SDR: C2gODEKp7lo2dhuKBo4fiJCVkdGAOB+LzvNwkC7FGJCP6KK/LJ2ef4DrNtSudevkcLfTkqAhd+ pg3XBfO4UfkA== X-IronPort-AV: E=Sophos;i="5.81,295,1610438400"; d="scan'208";a="412496407" Received: from sjard-mobl.amr.corp.intel.com (HELO skuppusw-mobl5.amr.corp.intel.com) ([10.212.174.17]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2021 21:52:01 -0700 From: Kuppuswamy Sathyanarayanan To: Peter Zijlstra , Andy Lutomirski , Dave Hansen Cc: Andi Kleen , Kirill Shutemov , Kuppuswamy Sathyanarayanan , Dan Williams , Raj Ashok , Sean Christopherson , linux-kernel@vger.kernel.org, Kuppuswamy Sathyanarayanan Subject: [PATCH v5 1/1] x86/tdx: Handle MWAIT, MONITOR and WBINVD Date: Wed, 31 Mar 2021 21:51:30 -0700 Message-Id: <2d097239a74ff1eb80653cfff1f1e16b0211e60e.1617252428.git.sathyanarayanan.kuppuswamy@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210401042436.GJ1285835@tassilo.jf.intel.com> References: <20210401042436.GJ1285835@tassilo.jf.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When running as a TDX guest, there are a number of existing, privileged instructions that do not work. If the guest kernel uses these instructions, the hardware generates a #VE. You can find the list of unsupported instructions in Intel Trust Domain Extensions (Intel® TDX) Module specification, sec 9.2.2 and in Guest-Host Communication Interface (GHCI) Specification for Intel TDX, sec 2.4.1.     To prevent TD guest from using these unsupported instructions, following measures are adapted:     1. For MWAIT/MONITOR instructions, support for these instructions are already disabled by TDX module (SEAM). So CPUID flags for these instructions should be in disabled state. Also, just to be sure that these instructions are disabled, forcefully unset X86_FEATURE_MWAIT CPU cap in OS.         2. For WBINVD instruction, we use audit to find the code that uses this instruction and disable them for TD. After the above mentioned preventive measures, if TD guests still execute these instructions, add appropriate warning messages in #VE handler. Signed-off-by: Kuppuswamy Sathyanarayanan Reviewed-by: Andi Kleen --- Changes since v4: * Fixed commit log and comments as per Dave's comments * Used WARN_ONCE for MWAIT/MONITOR #VE. * Removed X86_FEATURE_MWAIT suppression code. Changes since v3: * WARN user if SEAM does not disable MONITOR/MWAIT instruction. * Fix the commit log and comments to address review comments from from Dave & Sean. Changes since v2: * Added BUG() for WBINVD, WARN for MONITOR instructions. * Fixed comments as per Dave's review. Changes since v1: * Added WARN() for MWAIT #VE exception. Changes since previous series: * Suppressed MWAIT feature as per Andi's comment. * Added warning debug log for MWAIT #VE exception. arch/x86/kernel/tdx.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/x86/kernel/tdx.c b/arch/x86/kernel/tdx.c index e936b2f88bf6..9bc84caf4096 100644 --- a/arch/x86/kernel/tdx.c +++ b/arch/x86/kernel/tdx.c @@ -362,6 +362,22 @@ int tdg_handle_virtualization_exception(struct pt_regs *regs, case EXIT_REASON_EPT_VIOLATION: ve->instr_len = tdg_handle_mmio(regs, ve); break; + case EXIT_REASON_WBINVD: + /* + * WBINVD is not supported inside TDX guests. All in- + * kernel uses should have been disabled. + */ + pr_err("TD Guest used unsupported WBINVD instruction\n"); + BUG(); + break; + case EXIT_REASON_MONITOR_INSTRUCTION: + case EXIT_REASON_MWAIT_INSTRUCTION: + /* + * Something in the kernel used MONITOR or MWAIT despite + * X86_FEATURE_MWAIT being cleared for TDX guests. + */ + WARN_ONCE(1, "TD Guest used unsupported MWAIT/MONITOR instruction\n"); + break; default: pr_warn("Unexpected #VE: %d\n", ve->exit_reason); return -EFAULT; -- 2.25.1