From patchwork Mon Jun 26 14:12:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Kai" X-Patchwork-Id: 13292975 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CA2EEB64DA for ; Mon, 26 Jun 2023 14:14:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B31198D0009; Mon, 26 Jun 2023 10:14:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AE0C58D0001; Mon, 26 Jun 2023 10:14:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9A9138D0009; Mon, 26 Jun 2023 10:14:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8EE1D8D0001 for ; Mon, 26 Jun 2023 10:14:20 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 026961607FA for ; Mon, 26 Jun 2023 14:14:17 +0000 (UTC) X-FDA: 80945093796.21.B227809 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by imf09.hostedemail.com (Postfix) with ESMTP id 81A81140027 for ; Mon, 26 Jun 2023 14:14:13 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=Oz9yOQXd; spf=pass (imf09.hostedemail.com: domain of kai.huang@intel.com designates 134.134.136.126 as permitted sender) smtp.mailfrom=kai.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687788853; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=1Gv20mZE50yKLLR/fJ/q/fAgeLpMrFaQDtpRzRRFr00=; b=Ck/JG4HnWsccFbWxSBIWvtnzBrjGawfMeGMmtpxLcXrFDUwmZ9CtGc6tzW6NBOFPcsH7T2 QRJMdPjqiVvbSB8RkzI2Gl/6bfFJdScfvkocb5ljO5b/VAMsqxYQV1dCrqkv5ZWje49KTl XqFZiym4R+EPtzICAWlFfks1Za5c8lo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687788853; a=rsa-sha256; cv=none; b=WeU+PMBs1lIK+e/lgIimkO11ewAKVCzYjAUbf4Jt6k5NtpPmG6d0X2K30mu1dQZf7v3SdI uNHfas+X1sCmiE7SLX2hu1AnQeGLhPIYYVYHPQCIBvIsZY08HRCE69QXq/FLtwqfS4V71b 9YwIoMynyYD5saPUwsr6aQRgn0rQq2E= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=Oz9yOQXd; spf=pass (imf09.hostedemail.com: domain of kai.huang@intel.com designates 134.134.136.126 as permitted sender) smtp.mailfrom=kai.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687788853; x=1719324853; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0Ki7Z26euf8kOefnzsmE9r5pIZDZOVNrEdzPzosdKV8=; b=Oz9yOQXd6jKVK/Y2W8wEAzugACl9xOyXUbbYlaGsodjIEJ3fAGqTu9rI fow5r2hx2w/cL5NT96OpKcbu/fHCz6ifRCyCP6w5ITsvFJFvUFmSp2JWq uMoCTDY2svPYMAqE7WcxQPzCkKSrKsFyr6TaRyPSL3WDhX5AZ4+l0EwDt aJPJg8cGz/mmvfCmYe9eCXBIROaQ2/1R9RFgcgyoF28x/HzH/DT7lNdFn sxn0kWIoO+V6o1FTrm9H+C+5l3aJyCJLCNjITfiyaxxccs69iAUYoM8xO XlcJS0txTH11hBDYuu2ze7ED8u6VBFcSzvFDFyclLNQMr3rNO+TJX9+AF g==; X-IronPort-AV: E=McAfee;i="6600,9927,10753"; a="346033664" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="346033664" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2023 07:14:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10753"; a="890292303" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="890292303" Received: from smithau-mobl1.amr.corp.intel.com (HELO khuang2-desk.gar.corp.intel.com) ([10.213.179.223]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2023 07:14:06 -0700 From: Kai Huang To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: linux-mm@kvack.org, x86@kernel.org, dave.hansen@intel.com, kirill.shutemov@linux.intel.com, tony.luck@intel.com, peterz@infradead.org, tglx@linutronix.de, bp@alien8.de, mingo@redhat.com, hpa@zytor.com, seanjc@google.com, pbonzini@redhat.com, david@redhat.com, dan.j.williams@intel.com, rafael.j.wysocki@intel.com, ashok.raj@intel.com, reinette.chatre@intel.com, len.brown@intel.com, ak@linux.intel.com, isaku.yamahata@intel.com, ying.huang@intel.com, chao.gao@intel.com, sathyanarayanan.kuppuswamy@linux.intel.com, nik.borisov@suse.com, bagasdotme@gmail.com, sagis@google.com, imammedo@redhat.com, kai.huang@intel.com Subject: [PATCH v12 06/22] x86/virt/tdx: Handle SEAMCALL running out of entropy error Date: Tue, 27 Jun 2023 02:12:36 +1200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 81A81140027 X-Rspam-User: X-Stat-Signature: 771yd46cgribh6kxrwhyawwgh4d5r1or X-Rspamd-Server: rspam03 X-HE-Tag: 1687788853-311777 X-HE-Meta: U2FsdGVkX1/7gtt9wnZVOXikt4YI30LQxZ3J3eddY76QnVkDfQidaOU3MJcf1SYgaMETDMHOHo6mfo0C5Rf815rAj+JOVSoG3sC62DOxLBWcbnjY0SwIw0qYpbJpWm6C+wCT9j+v9fGFykd1fBOQj6jkLjt5MVhcvhQgnXXTfkhDV6UUzhXtmoLjzcX3gn3AxL+96iV5nO5aeHeeIOzq0oANoC+dJscfpht+Aj8ulNvyXsmfFP/yb2uBBqE5pUaJ640xvU41gE1zQxqeq7jqFdFajGeJKVl7ya803U3xDusrfpNhbnrmLvnkHZFnVto+FA+qaEFiagumdxeaywqDH0JknWVR4XmwsFTn2xOeIeUArJcjMzbQnVSLYC8oMY6G1gTneEK8dX2ixdCIcmPfhy423H/I5uGnZ+wy4VoZ0bC0zUalXe0ZoypGFlbeBA1Q8HDqMsTnbH+/KNJL9syy+i0hWlL/n2PYb0J+VoKc2RJXKhYx7OvqEODVoErSByH2KUiwjKw8xTaJZiUO0R5wEg+VaptqIk3j/SwLZHR8062OUYXnqpkqRGA2pOyddi04E+WB6gHucJC+PmoqcwWhmaRaj8aLH8Q2wOpAa6EmCPoBhVc9cVQNzS7dPe/fkfXOLKeVelDEfwupD1bQM7syRqZRZiYw2Kgk0w+2Qoce8+a0SpFFW83jHhdG1tu9kHZ2OKr+Fj3p5wvAxwfKf4g4cuRLIDreLIFY7CrQaN6Z09N4C44Rb92fMxgLzRVLz6PxTzONBaB+4Muir7j/woqH4nRveQywySJe//2kqJWDLcbfhSwWGZFBsXn569mE/XTMxh/C5E/hkbHysqEEQ0NRGekgpMnlISdexmhrgKbk0xxNo89D301REdtRgrGqAMMODy0q+dD63SJX7NJj96HHpmfwIBpZ2qECVTBaSl5h5p6fGqsdIsS3LYSSBCrGPLmHfOcBPcHOUqb8k1iopnH Fr1gWXdX cfE2YKyH3CCHzqNpMYBGCrC+SFyHwWPro20W2I2FmYaCh3zjtQmfZe2R+D0DgMYfV/NWntQ7SKX9OjV8M9XIJp7dw38moFcgPvqUu0h1Ba+28FsNh1Mg/Uq35wI7vjNpb2bH+idHjjFeP25pK6RXIZq1XEfLaDjmo38+wY5hvDGbu/uMEqv9947SCnw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Some SEAMCALLs use the RDRAND hardware and can fail for the same reasons as RDRAND. Use the kernel RDRAND retry logic for them. Signed-off-by: Kai Huang Reviewed-by: Dave Hansen Reviewed-by: Kirill A. Shutemov Reviewed-by: David Hildenbrand --- v11 -> v12: - Added tags from Dave/Kirill/David. - Improved changelog (Dave). - Slight code improvement (David) - Initialize retry directly when declaring it. - Simplify comment around mimic rdrand_long(). v10 -> v11: - New patch --- arch/x86/virt/vmx/tdx/tdx.c | 16 ++++++++++++++-- arch/x86/virt/vmx/tdx/tdx.h | 17 +++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c index f8233cba5931..141d12376c4d 100644 --- a/arch/x86/virt/vmx/tdx/tdx.c +++ b/arch/x86/virt/vmx/tdx/tdx.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include "tdx.h" @@ -32,12 +33,23 @@ static int __always_unused seamcall(u64 fn, u64 rcx, u64 rdx, u64 r8, u64 r9, u64 *seamcall_ret, struct tdx_module_output *out) { + int cpu, retry = RDRAND_RETRY_LOOPS; u64 sret; - int cpu; /* Need a stable CPU id for printing error message */ cpu = get_cpu(); - sret = __seamcall(fn, rcx, rdx, r8, r9, out); + + /* + * Certain SEAMCALL leaf functions may return error due to + * running out of entropy, in which case the SEAMCALL should + * be retried. Handle this in SEAMCALL common function. + * + * Mimic rdrand_long() retry behavior. + */ + do { + sret = __seamcall(fn, rcx, rdx, r8, r9, out); + } while (sret == TDX_RND_NO_ENTROPY && --retry); + put_cpu(); /* Save SEAMCALL return code if the caller wants it */ diff --git a/arch/x86/virt/vmx/tdx/tdx.h b/arch/x86/virt/vmx/tdx/tdx.h index 48ad1a1ba737..55dbb1b8c971 100644 --- a/arch/x86/virt/vmx/tdx/tdx.h +++ b/arch/x86/virt/vmx/tdx/tdx.h @@ -4,6 +4,23 @@ #include +/* + * This file contains both macros and data structures defined by the TDX + * architecture and Linux defined software data structures and functions. + * The two should not be mixed together for better readability. The + * architectural definitions come first. + */ + +/* + * TDX SEAMCALL error codes + */ +#define TDX_RND_NO_ENTROPY 0x8000020300000000ULL + +/* + * Do not put any hardware-defined TDX structure representations below + * this comment! + */ + struct tdx_module_output; u64 __seamcall(u64 fn, u64 rcx, u64 rdx, u64 r8, u64 r9, struct tdx_module_output *out);