From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 4C54DC2C9; Thu, 15 May 2025 11:17:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747307824; cv=none; b=rU/CoMyR5snzX+baicudmjnLw1TtXpKYxcTURA8RxGgKMSSY+4wjTvyewqxFZbTJ/m0OC6WU09uLt1hiLaU+JqYy3XyFL401+mYxkRrF67vtZOyTjNzIjXwdzHkBn3XxUF1I0twV0S1TwdleSVcFDvHiA+GH1RJMSzTkLkNy9qE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747307824; c=relaxed/simple; bh=BMe/f2YXmynuK/sxauGntRWDm3isebQoPkXwug7na7Y=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=XIQs894oHOMTNmPHsGJm064iZv2ZH/yCO6pm8nCDu2EudVHuY32Kn3Q0TZs+keX/8542Q9g3/olJBJ5mCpsKjE1mqSA5C9RY2psq5BGatZaE89LZ8ml68gc9hcm82Aeaxx834eP0cnnka/JMnnXnl5VxQOWCERuqq7ZkmLCllHw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=o1qjyxye; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="o1qjyxye" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6CC10C4CEE9; Thu, 15 May 2025 11:17:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747307823; bh=BMe/f2YXmynuK/sxauGntRWDm3isebQoPkXwug7na7Y=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=o1qjyxyeBKFKZ4hsvcobBUxGXk52qrmvsDj91GY5ejSMExXSTUtHlNpRxqVlrZmEn lfxcbOhfhUeOp0Yk2ttuuDgVQF2Hr5F23fDcnEmCJiUNF4jlweQtmKmY9io4DDDanX P8tLSC0YL0CG1D5rPNYh+1inV7bFhWqt7xjal2VnZgKowsjfzjlFxYdQcqwlIHwo1Z o8B51tWuhfb67ye7dmMc/SEzn/14Seag2I6wgahcZxv1MVP/vufQf9/6aW/+bp7s4s IHfR3Xx5BdAHV/kTURgXyy6SKcEbsW1zEcKo8Am7WfSWFzkvETOInrDNr5HKmZQIB0 3G159QdvSBTJg== Date: Thu, 15 May 2025 14:17:00 +0300 From: Jarkko Sakkinen To: Michal =?iso-8859-1?Q?Such=E1nek?= , Sasha Levin Cc: Peter Huewe , Jason Gunthorpe , linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan McDowell , Paul Menzel Subject: Re: [PATCH v3] tpm: tis: Double the timeout B to 4s Message-ID: References: <4e4640bd-0313-4594-9667-82340ed9368a@molgen.mpg.de> <20250404082325.13876-1-msuchanek@suse.de> Precedence: bulk X-Mailing-List: linux-integrity@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: On Thu, May 15, 2025 at 04:41:52AM +0300, Jarkko Sakkinen wrote: > On Wed, May 14, 2025 at 02:10:45PM +0200, Michal Suchánek wrote: > > Hello, > > > > On Fri, Apr 04, 2025 at 11:53:00AM +0300, Jarkko Sakkinen wrote: > > > On Fri, Apr 04, 2025 at 10:23:14AM +0200, Michal Suchanek wrote: > > > > 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 > > > > --- > > > > 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, > > > > -- > > > > 2.47.1 > > > > > > > > > > > > > > Cc: stable@vger.kernel.org # v6.1+ > > > > > > Probably best that I'll piggyback a patch set for stable with the two > > > fixes, in order to cause least noise. I need to do this *after* an > > > ack'd PR to -rc2. > > > > While there is talk about stable this does not seem to be applied > > anywhere I could find. Is that expected? > > Definitely not. I got shifted away with other work early April and > this was left to my TODO folder, apologies. > > Sasha, can you also auto-select this to v6.1+? It is in my next > branch now (should be soon'ish mirrored to linux-next). I got shifted away at work for a while and since it has been a while, and the thread is a bit messy, can you check if there was still something else I ought to pick up: https://lore.kernel.org/linux-integrity/D9WD3016M557.1ZXO3GLKGUIIF@kernel.org/ Now "tpm: tis: Double the timeout B to 4s" has a legit commit ID at least, and will land to 6.15. BR, Jarkko