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: Kai Huang X-Patchwork-Id: 112981 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7529135vqr; Mon, 26 Jun 2023 07:35:46 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ75+CAYNU2VgMEIDURBKKPRSHriFgQYprN4EuKbUoOQ8iXLXvf6Qaa4d/elkPBIraqcKfFz X-Received: by 2002:a05:6a20:7f8a:b0:118:2e5a:efab with SMTP id d10-20020a056a207f8a00b001182e5aefabmr28592015pzj.4.1687790146396; Mon, 26 Jun 2023 07:35:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687790146; cv=none; d=google.com; s=arc-20160816; b=t6bxiTKvayn9oLLc4HeT5VEPv3jDMylPk8VZl/+kJXSQQy4Vx4S0jT59yRc1Ygtuwx y2ZmqSi65N1qB23RR2WgsVNSaWIrXkFQXEEXxotT6FPPvrKDUNZ2ISW4xXVkPjiavixs wL4/lnsOlF9dwQPJNb2/injfBsLm7KeGsPrwHK0hiLiJssCBNeSHxrxZKe9yFKeZn4U6 AV2U3Ri93wmSie1FOmlr7Xw7/A5hdBMd9YRkCLDkLqQRiA6m3it4M0gpxXtaN3Nnph6h ai1R08+/yrf5QY6pBd67vRWCAdMT+RtrN4y5mZuEy0SltSd2tJUvcnB9C2ZZZ8DY/I3k ycaA== 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 :dkim-signature; bh=1Gv20mZE50yKLLR/fJ/q/fAgeLpMrFaQDtpRzRRFr00=; fh=6HfxY0KVNaGJjlkZjh3Hzm5TphdbqQTBO+53/7gNlSk=; b=0qFiyXrHbv6iSAbHNgXsOYe63bMMO5etTkYSNzzK18Oe4sn68CZ/MQcZi/4lb2zXP9 leYWQnV0sP0LjY/xCm0OciYgGLOCtQz9ZjyR6X5V+N/mV77hdGXiEOMUw6BOemrmNYU0 VumHWTLTMmnx7MiUvby0jlQa5Sqkmf5M0yzuP5BjL1YezYNzSDVCLegOnCNZS11mUgwW VFm9LCp2lyIC1QBGFVfgwQKEPJFqS33tZGx4Q47YGCrjh2Igu28p0JcRDyG9VJVY3VTZ HoiYlRKsYmgreUE7hLPoDWGmCsbSgrvbc0cVgUO7fS3xdSY6uhGUNodB2ReFGejoL1PF iImw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TDS1PXNQ; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a187-20020a6390c4000000b00544b88dda2csi5502208pge.661.2023.06.26.07.35.31; Mon, 26 Jun 2023 07:35:46 -0700 (PDT) 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=@intel.com header.s=Intel header.b=TDS1PXNQ; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229851AbjFZOPI (ORCPT + 99 others); Mon, 26 Jun 2023 10:15:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231312AbjFZOOj (ORCPT ); Mon, 26 Jun 2023 10:14:39 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 048392136; Mon, 26 Jun 2023 07:14:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687788854; x=1719324854; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0Ki7Z26euf8kOefnzsmE9r5pIZDZOVNrEdzPzosdKV8=; b=TDS1PXNQnMhvBxbuf+z787MPjPgRQXXpPvjgaJFXHdHKf9s5O++AE4Wa +0iCMHJThmtn1bSwaZScyPhTXurcDOt2S+sGON3lBYMq4WmwBQo/ZX4Kh 1ZCV6xREz6TuaSU5UIWwNgBnprNBjFz+TZsbub6JhvbSk8+Xwjriqpr2q PtEp3cYcVZ4sO1/AAzxlqDEGKzEEiFmZc6SnhVaj90GaYtlm26Xco1Va2 4fNePkwZ98o5pcgn45dCEntcxW7yXzgGv7S57W0LGmDy5NimaNoyJILx+ REPKr8xqbhfNiueQI9RAYM0sSTexaosPMz63rQ+sgnIxJLUL7qjwkiCU/ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10753"; a="346033662" X-IronPort-AV: E=Sophos;i="6.01,159,1684825200"; d="scan'208";a="346033662" 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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1769776240309338082?= X-GMAIL-MSGID: =?utf-8?q?1769776240309338082?= 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);