Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp3162212rdg; Tue, 17 Oct 2023 06:34:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHj2exjaeb2AEHYH6dtkbVtZyrcLnSUjet0bkgOnHRwUDgdvOtCJTlfqMEQEacmSpbF2xRc X-Received: by 2002:a17:90a:199e:b0:27d:222c:f5eb with SMTP id 30-20020a17090a199e00b0027d222cf5ebmr2069957pji.11.1697549686362; Tue, 17 Oct 2023 06:34:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697549686; cv=none; d=google.com; s=arc-20160816; b=lmFaCTxJZIawKwNbizikO9ybMylzOiQXFMt/ytBdUAvt+bXVcPDnoXukkp9uDfa/zd h9P/qbSQy4EYHadpBxKctUmIi+EcOtzx88E6CbSSYJveIYJ6gVqhepd9emsYREvZ3v+3 eI5BwrW3EKb89VD8iNtQPXZfp0SstSPy5z+V1mPHtNHv58aNmGsC6to+IH9pvkQAiRiH r7OjSV5b4CL+Lg+3VX1esV4sXLKrhDXmDMz24ASBCinmG1xcg9wUvV+cuCxeuxg95r7/ htC5K01nHifUMnH4oc1ijmqkOS+yE7FtY0rjBi/XFiU1wBZZpNu+8L6b1w+YEzASYCbY 5fww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=5dC/g3LIffrP+YJ+V80fo0dPGnlWebBu4mkO7OSJez4=; fh=8eXFfYdvKzYh2ewpIcxvlnOfy0KHTqaj8EYDpK9vJeI=; b=JCMlAkuz86Bp4Oj6Wvh5p9AC7/kAXJByu6Y/c5LnPBS0pr7Z7KFNHa70ySVyzQzr5h rEOPq/pq4TMHu5Z8bG8+M2PNHd11Jkrh+PK4Oe0n8ShWz1GdRsiDX+K/oa/KMV34yWJD vU2Pzk/4crT8MWC2opMFmWsfFMRLZSZPp28b/EDNA9ljUzjNX6Jy9Cpsm/hFm7An+gNq ssSYoYdwf9FCM82whl/lx2+Ho+w0T9+JdK9xnyZxP0pg0xFnwzU1ghTiY49z4hz4bG6K SSfqucizqO5nhpC2wrZ6D+reJf+TCM/10DH9iX5Owv9CAeHRmjXj44T3uAqddfuENg/s w5Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TcEpRaS6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id v1-20020a17090ac90100b0027762924984si8330382pjt.183.2023.10.17.06.34.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 06:34:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TcEpRaS6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 11379801B4A6; Tue, 17 Oct 2023 06:34:44 -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 S1343861AbjJQNek (ORCPT + 99 others); Tue, 17 Oct 2023 09:34:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343642AbjJQNej (ORCPT ); Tue, 17 Oct 2023 09:34:39 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01F26F0; Tue, 17 Oct 2023 06:34:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697549678; x=1729085678; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=ar0hHvQvp5BFk8tVIHGjdWvXPxmhKvWwhrPxeliAhfE=; b=TcEpRaS6vWObVnrtBzjLkhzX9Gn7uH6Q4ndMDu1y+tSMlK3iFBoInoAd K9Jyog0H6fKQxewzqdzS2bloe8GDzKpN+2wLP1agXBl2tSX7ahDOJDKZH FxlolW7yf3yY25w9DGxpmYT9KK8V5map5vjRAPDUDW35EB69Wmmrs558S wXYGWV9KTIl6rYDINwQc5jEXRE52IiFwmwciQ8AU/tfe+pVYXPSP7B7IZ e1S7pdJw5mmeLDEc/W4RiCKvJiMDSejGRYxgkApa3GjwJHSzIHJU/SYdJ 4kCSbazK4Pt8U6uKwb//kBw1O0KZPSBA6xMbF44Z4zoa9OoB+hkcHHAV+ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10866"; a="383005035" X-IronPort-AV: E=Sophos;i="6.03,232,1694761200"; d="scan'208";a="383005035" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2023 06:34:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10866"; a="1087502716" X-IronPort-AV: E=Sophos;i="6.03,232,1694761200"; d="scan'208";a="1087502716" Received: from nmdsouza-mobl1.amr.corp.intel.com (HELO [10.209.106.102]) ([10.209.106.102]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2023 06:34:35 -0700 Message-ID: <736a6745-3ba7-4a0e-a00c-bb36fa1cc51c@linux.intel.com> Date: Tue, 17 Oct 2023 06:34:36 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v14 05/23] x86/virt/tdx: Handle SEAMCALL no entropy error in common code Content-Language: en-US To: Kai Huang , linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: x86@kernel.org, dave.hansen@intel.com, kirill.shutemov@linux.intel.com, peterz@infradead.org, tony.luck@intel.com, tglx@linutronix.de, bp@alien8.de, mingo@redhat.com, hpa@zytor.com, seanjc@google.com, pbonzini@redhat.com, rafael@kernel.org, david@redhat.com, dan.j.williams@intel.com, len.brown@intel.com, ak@linux.intel.com, isaku.yamahata@intel.com, ying.huang@intel.com, chao.gao@intel.com, nik.borisov@suse.com, bagasdotme@gmail.com, sagis@google.com, imammedo@redhat.com References: From: Kuppuswamy Sathyanarayanan In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 17 Oct 2023 06:34:44 -0700 (PDT) On 10/17/2023 3:14 AM, Kai Huang wrote: > Some SEAMCALLs use the RDRAND hardware and can fail for the same reasons > as RDRAND. Use the kernel RDRAND retry logic for them. > > There are three __seamcall*() variants. Do the SEAMCALL retry in common > code and add a wrapper for each of them. > > Signed-off-by: Kai Huang > Reviewed-by: Kirill A. Shutemov > --- > > v13 -> v14: > - Use real function sc_retry() instead of using macros. (Dave) > - Added Kirill's tag. > > v12 -> v13: > - New implementation due to TDCALL assembly series. > --- Reviewed-by: Kuppuswamy Sathyanarayanan arch/x86/include/asm/tdx.h | 26 ++++++++++++++++++++++++++ > 1 file changed, 26 insertions(+) > > diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h > index a252328734c7..d624aa25aab0 100644 > --- a/arch/x86/include/asm/tdx.h > +++ b/arch/x86/include/asm/tdx.h > @@ -24,6 +24,11 @@ > #define TDX_SEAMCALL_GP (TDX_SW_ERROR | X86_TRAP_GP) > #define TDX_SEAMCALL_UD (TDX_SW_ERROR | X86_TRAP_UD) > > +/* > + * TDX module SEAMCALL leaf function error codes > + */ > +#define TDX_RND_NO_ENTROPY 0x8000020300000000ULL > + > #ifndef __ASSEMBLY__ > > /* > @@ -82,6 +87,27 @@ u64 __seamcall(u64 fn, struct tdx_module_args *args); > u64 __seamcall_ret(u64 fn, struct tdx_module_args *args); > u64 __seamcall_saved_ret(u64 fn, struct tdx_module_args *args); > > +#include > + > +typedef u64 (*sc_func_t)(u64 fn, struct tdx_module_args *args); > + > +static inline u64 sc_retry(sc_func_t func, u64 fn, > + struct tdx_module_args *args) > +{ > + int retry = RDRAND_RETRY_LOOPS; > + u64 ret; > + > + do { > + ret = func(fn, args); > + } while (ret == TDX_RND_NO_ENTROPY && --retry); > + > + return ret; > +} > + > +#define seamcall(_fn, _args) sc_retry(__seamcall, (_fn), (_args)) > +#define seamcall_ret(_fn, _args) sc_retry(__seamcall_ret, (_fn), (_args)) > +#define seamcall_saved_ret(_fn, _args) sc_retry(__seamcall_saved_ret, (_fn), (_args)) > + > bool platform_tdx_enabled(void); > #else > static inline bool platform_tdx_enabled(void) { return false; } -- Sathyanarayanan Kuppuswamy Linux Kernel Developer