From patchwork Tue Jan 30 08:30:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 194177 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1222481dyb; Tue, 30 Jan 2024 05:36:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IGhML0o92gFobubOTY3C7+HWm4dzmKPjtBqTY0Iua4Q02dQwe9ntzvg6F2W3t8f/qe9y/ZE X-Received: by 2002:a17:906:f2d6:b0:a31:5941:4f7 with SMTP id gz22-20020a170906f2d600b00a31594104f7mr6296141ejb.39.1706621782437; Tue, 30 Jan 2024 05:36:22 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706621782; cv=pass; d=google.com; s=arc-20160816; b=uP8zK8NJfPoxfLQ8nJhoeAadJVAdMETnwP2oC8ol6wO6aKq0zTAZ7BrOAIvE6/5BRo cCAQJnegq/I5J2yJlOXv3XRi7NPb4b4o/2ga+AcmMLcY0x5+Fhkdv3dwezFlkrbd4jCR ARvV9k0hzm0fDDOpFNBnLL2Car+bJyaeXel+z+QfvJvHjIUJpiWOvEJOyr/4HW1jwp0u E+F6+uTwVibPB/lhdD5Lzf29S64LzQpVPINxgP6EkceyZxGhAFi4fiGLuiMqubPyP9w7 myL1I9QX0PCloyjS5lHQJ8OuoV0N15VwZNsPYNcGpz9UeoV4+pEfxAhw8A+nr0GNegfJ TTqQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=q1U0xxr7NbDQ1APeZApOThkxr40MUek3YuM/FrkqZvU=; fh=ODt9kxcTNWB7X1EmolPcmJdx0Rxj6DM5rRkwFDfN79c=; b=YBRIXW+i+3/7ws5/hHxgBW3Vv+eVoRuzOx9UnEH4P8xFn9gOrzSKsDj52Ot05TQUmf boWL+CHUS2bdVA2FT+8vh2AkehdxFa9m/Ove59lORCwtXv2vnJ3AUci1Pq4D4Yu7+fLU 1JqWty9O4oit4Y3zKF2hatwPvYp7qVVlGHm5B3lMzx+BjfBRZw4+qktnr2Nrov1f/cNw UIjXIdGtEaKXZ6bkf0BaYWqvPG8LLalmc+NifofC9JyFQBFQvPlzg7u67Dj+BoNAVBXK bnU5UCVpY57tC7DqqNHsihLWU0QTgUPiKWiqrJXAknJSPByhcRiDBJlto0U1BnyeQXf3 6tAw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="W/e4fGrO"; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-44136-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-44136-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id bl23-20020a170906c25700b00a35a69ff2a2si2148745ejb.864.2024.01.30.05.36.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 05:36:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-44136-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="W/e4fGrO"; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-44136-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-44136-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 5DA911F24B84 for ; Tue, 30 Jan 2024 08:31:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E405757881; Tue, 30 Jan 2024 08:30:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="W/e4fGrO" Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) (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 80BF41E52C for ; Tue, 30 Jan 2024 08:30:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=134.134.136.31 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706603457; cv=none; b=TWnaD69fo2seLR77TK1FfGMVq8nsxJhI3WIFY2Ayf3DYgvIa0ZN/3sZVw7lkypkFZx1IZCXGUdBPKc41tSasXB4T6JrD4HsIZYPAh0fZx2xKUtoiEk3fbj4sJFLpKPnlUqjHUfv0c1Xv6BokHQapI6Bmuw/m+EtwXpruUtkVyqg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706603457; c=relaxed/simple; bh=bboqiXpspNty+IUr75AIb5o8t24UN3eTB7gE/wxTugU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=pVyfO9DK+tFLFMt1QRtp5QIO3Zdoa6v70vxakR+bTRBorhixEaoxWL2VopVuLOFhUW50fj2+U7lh7UeabAOnEh34Rhulv0P/pmrpUYnf0yhCC0pncQdzb68B0yXCv9s1i/Cmm9ib1Rph8askSF0EPidIEyPHmsvi9Etuqb9fTcY= 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=W/e4fGrO; arc=none smtp.client-ip=134.134.136.31 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1706603455; x=1738139455; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=bboqiXpspNty+IUr75AIb5o8t24UN3eTB7gE/wxTugU=; b=W/e4fGrOycPonf5ZB6fkIRXhcv4JHn4gKUHXqvzVih9cnrDoSp/zrr9F O7deKy+fFG0GtAH5mCl5VI9n0NnlRMuXW8QBf5dJylzJd3NQ5UJGtOcU8 PVH84BJ245h6jqMIOm9OSYdWpL0D0Sb0yol61x3iVd2+pxqgc1xiFFCIJ QAo6+0dpS2hOIXKaW5drqlmo81gbrLY0y8kzRxLmoCYlJPsmtztQnK0bi 66Ik8utqNG8za/qZv0UBGt5+5WEZHeM06viCsqkTk8/51kewlDBF8bxLi xocIwiae3fZDJxpjp0R7UO6e5UYVdkRsE9heH6OzyXatZIgKRH4FviVc3 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10968"; a="467464323" X-IronPort-AV: E=Sophos;i="6.05,707,1701158400"; d="scan'208";a="467464323" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2024 00:30:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10968"; a="822120351" X-IronPort-AV: E=Sophos;i="6.05,707,1701158400"; d="scan'208";a="822120351" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 30 Jan 2024 00:30:13 -0800 Received: by black.fi.intel.com (Postfix, from userid 1000) id 751D5DE; Tue, 30 Jan 2024 10:30:12 +0200 (EET) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , x86@kernel.org, "Theodore Ts'o" , "Jason A. Donenfeld" Cc: Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Tom Lendacky , "Kalra, Ashish" , Sean Christopherson , linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH 1/2] x86/random: Retry on RDSEED failure Date: Tue, 30 Jan 2024 10:30:06 +0200 Message-ID: <20240130083007.1876787-1-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789518447278626787 X-GMAIL-MSGID: 1789522642077369852 The function rdrand_long() retries 10 times before returning failure to the caller. On the other hand, rdseed_long() gives up on the first failure. According to the Intel SDM, both instructions should follow the same retry approach. This information can be found in the section titled "Random Number Generator Instructions". To align the behavior of rdseed_long() with rdrand_long(), it should be modified to retry 10 times before giving up. Signed-off-by: Kirill A. Shutemov Reviewed-by: Kuppuswamy Sathyanarayanan --- arch/x86/include/asm/archrandom.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/archrandom.h b/arch/x86/include/asm/archrandom.h index 02bae8e0758b..918c5880de9e 100644 --- a/arch/x86/include/asm/archrandom.h +++ b/arch/x86/include/asm/archrandom.h @@ -33,11 +33,19 @@ static inline bool __must_check rdrand_long(unsigned long *v) static inline bool __must_check rdseed_long(unsigned long *v) { + unsigned int retry = RDRAND_RETRY_LOOPS; bool ok; - asm volatile("rdseed %[out]" - CC_SET(c) - : CC_OUT(c) (ok), [out] "=r" (*v)); - return ok; + + do { + asm volatile("rdseed %[out]" + CC_SET(c) + : CC_OUT(c) (ok), [out] "=r" (*v)); + + if (ok) + return true; + } while (--retry); + + return false; } /*