From patchwork Fri Apr 4 08:23:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Suchanek X-Patchwork-Id: 14038211 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F01D18BBB0 for ; Fri, 4 Apr 2025 08:23:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743755024; cv=none; b=soyqWwDnN5XlD8ZBicCrsnYsLFuuOOTqTn8nG1/g9i4+2XDPtv1UPe9v8Yar9+skAESYZqfjoBArtXhtCIuPHGoWCUkwcQ/khfC1ylK9xcctIkJO7goFP62ddJNH9zQB0Lr64Q40i10yGrKOgqhNWMGl2Rw9sk3gPQUtFqpb9bs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743755024; c=relaxed/simple; bh=8XquGULLcICQYyf9HOU+q24y7v025GgX6yuYaoaYW7E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D9Gm29zZ1R0LrUretY5RUVRtpFSFRsrnUOKoOas1fuT1LZfLyAzfNsl3/XiVtY3RI6MGo3O3zNzHvloXhRwTI6ZkGCaZ6tA3+hqNZcr+4u+mtX8F/7JUrYmfX0I+nW8cSF37MQB1esbLtWTuv6fQ+suI6IKta5Hmy6yNf9gqP40= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=myv/AeG5; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=wHykj7eH; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=myv/AeG5; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=wHykj7eH; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="myv/AeG5"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="wHykj7eH"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="myv/AeG5"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="wHykj7eH" Received: from kitsune.suse.cz (unknown [10.100.12.127]) by smtp-out1.suse.de (Postfix) with ESMTP id 13AF9211A7; Fri, 4 Apr 2025 08:23:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1743755021; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KYKspqlH24peNBIR8ojFJzzAyckzzD8GPL06yF65W9A=; b=myv/AeG5WNfkl+8HLcYELu2AaXMepeWOkq94TSRBj+oxYjVECmOuXknLwJeTpMQMFjIDZb KNW+dOfmbGl+j3M7Trx0hLpZKwuVgLou/aZ8Pi2WRdrO53fvVmiV2LqeHfTX0KXpvVEiD6 PyorYN5KUrjC+OKvHF+D40uNTEfcdls= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1743755021; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KYKspqlH24peNBIR8ojFJzzAyckzzD8GPL06yF65W9A=; b=wHykj7eHbmBvJZxqFTp7cDJDYjqo+GyeZhziypm+498Ere3o7EXwnrcWbK8QQnnmPZzROS 03Kuh0b89JnJEEAw== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1743755021; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KYKspqlH24peNBIR8ojFJzzAyckzzD8GPL06yF65W9A=; b=myv/AeG5WNfkl+8HLcYELu2AaXMepeWOkq94TSRBj+oxYjVECmOuXknLwJeTpMQMFjIDZb KNW+dOfmbGl+j3M7Trx0hLpZKwuVgLou/aZ8Pi2WRdrO53fvVmiV2LqeHfTX0KXpvVEiD6 PyorYN5KUrjC+OKvHF+D40uNTEfcdls= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1743755021; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KYKspqlH24peNBIR8ojFJzzAyckzzD8GPL06yF65W9A=; b=wHykj7eHbmBvJZxqFTp7cDJDYjqo+GyeZhziypm+498Ere3o7EXwnrcWbK8QQnnmPZzROS 03Kuh0b89JnJEEAw== From: Michal Suchanek To: Cc: Michal Suchanek , Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe , linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan McDowell , Paul Menzel Subject: [PATCH v3] tpm: tis: Double the timeout B to 4s Date: Fri, 4 Apr 2025 10:23:14 +0200 Message-ID: <20250404082325.13876-1-msuchanek@suse.de> X-Mailer: git-send-email 2.47.1 In-Reply-To: <4e4640bd-0313-4594-9667-82340ed9368a@molgen.mpg.de> References: <4e4640bd-0313-4594-9667-82340ed9368a@molgen.mpg.de> Precedence: bulk X-Mailing-List: linux-integrity@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Score: -2.80 X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_SEVEN(0.00)[8]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; FREEMAIL_CC(0.00)[suse.de,gmx.de,kernel.org,ziepe.ca,vger.kernel.org,earth.li,molgen.mpg.de]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[kitsune.suse.cz:helo,suse.de:mid,suse.de:email]; FREEMAIL_ENVRCPT(0.00)[gmx.de] X-Spam-Flag: NO X-Spam-Level: With some Infineon chips the timeouts in tpm_tis_send_data (both B and C) can reach up to about 2250 ms. Timeout C is retried since commit de9e33df7762 ("tpm, tpm_tis: Workaround failed command reception on Infineon devices") Timeout B still needs to be extended. The problem is most commonly encountered with context related operation such as load context/save context. These are issued directly by the kernel, and there is no retry logic for them. When a filesystem is set up to use the TPM for unlocking the boot fails, and restarting the userspace service is ineffective. This is likely because ignoring a load context/save context result puts the real TPM state and the TPM state expected by the kernel out of sync. Chips known to be affected: tpm_tis IFX1522:00: 2.0 TPM (device-id 0x1D, rev-id 54) Description: SLB9672 Firmware Revision: 15.22 tpm_tis MSFT0101:00: 2.0 TPM (device-id 0x1B, rev-id 22) Firmware Revision: 7.83 tpm_tis MSFT0101:00: 2.0 TPM (device-id 0x1A, rev-id 16) Firmware Revision: 5.63 Link: https://lore.kernel.org/linux-integrity/Z5pI07m0Muapyu9w@kitsune.suse.cz/ Signed-off-by: Michal Suchanek Reviewed-by: Jarkko Sakkinen --- v2: Only extend timeout B v3: Update commit message --- drivers/char/tpm/tpm_tis_core.h | 2 +- include/linux/tpm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h index 970d02c337c7..6c3aa480396b 100644 --- a/drivers/char/tpm/tpm_tis_core.h +++ b/drivers/char/tpm/tpm_tis_core.h @@ -54,7 +54,7 @@ enum tis_int_flags { enum tis_defaults { TIS_MEM_LEN = 0x5000, TIS_SHORT_TIMEOUT = 750, /* ms */ - TIS_LONG_TIMEOUT = 2000, /* 2 sec */ + TIS_LONG_TIMEOUT = 4000, /* 4 secs */ TIS_TIMEOUT_MIN_ATML = 14700, /* usecs */ TIS_TIMEOUT_MAX_ATML = 15000, /* usecs */ }; diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 6c3125300c00..3db0b6a87d45 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -224,7 +224,7 @@ enum tpm2_const { enum tpm2_timeouts { TPM2_TIMEOUT_A = 750, - TPM2_TIMEOUT_B = 2000, + TPM2_TIMEOUT_B = 4000, TPM2_TIMEOUT_C = 200, TPM2_TIMEOUT_D = 30, TPM2_DURATION_SHORT = 20,