Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp2559543pxu; Sat, 28 Nov 2020 19:30:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJxjokbh5jkmKitcHq355bDndkcT8SieDVfxh0cxQgcQE1QMbUMFcmTA8pjEIItSQIo5Fodh X-Received: by 2002:aa7:d443:: with SMTP id q3mr15451529edr.262.1606620610032; Sat, 28 Nov 2020 19:30:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606620610; cv=none; d=google.com; s=arc-20160816; b=XAbvSbFUcVRCMOeINIFV9FdtLGl/Hhr4+HCl9xqsUBDSQIv+cb3yqRw7rTZGW0dcKe mGPErVyoTQE16/PEviy6KIJTNUdg4J/k/1ExiDQAG5u4sasH/+ZLUG+eWFeZM0HMEbd6 yzJdVxXZC7yxEZlFwkB1I/TLIITCZHNy267NfFSYWhvpMgx5m+734BLTqjiDFmd7iHHd O0uzCHwU3cdsLswEa4mcANwiacuL5qm+QqDfg0F/KP5kdxVR3yq0dRfhn1xd2Brg4NLy lsLHV8LJM3Wq1axLuweGtiJ2b6fPKgaoDS6wTOeERAHmFmhtbdBXzPFKfz2QPwlEYHU7 FrCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=l0+l1hS2ZkG4sOjQPLptvMrVCi+C3hwG2hSl7cXmozQ=; b=DGVtEOL1CmNLCbmmrXHSMsChNIsoVFBI6BG5f2zhYCTrMznrXRewYJ1IDv1CzDfqkC xZyyd7AGPdOkElvLnSi4+4kB8ZmxJANBj9GR+2dSMkRNTaHPVDldRmnC+zmLTg8uWu7R IE+bKT9XtNAslLSaDbj8qsuHG/j8OD2BOggBgTx7Yp/jCNbIB/k4zYL8yMbs+Y7accpa szy6p3gBSynj1UA5AC4VclHV93xWkVWI0BFheTanSxhjKTqOObRXtAvD33+RlCkAlERz 88WeJdDTHbEVOCoEQrHjSJCbdUbiGrgq4GtQHP7qsu7lf87qYSjv34TcUPLyVzv3QRwt QIaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yCjAGNgb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q2si8342678ejd.502.2020.11.28.19.29.47; Sat, 28 Nov 2020 19:30:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yCjAGNgb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726514AbgK2DXw (ORCPT + 99 others); Sat, 28 Nov 2020 22:23:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:43240 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725294AbgK2DXw (ORCPT ); Sat, 28 Nov 2020 22:23:52 -0500 Received: from kernel.org (83-245-197-237.elisa-laajakaista.fi [83.245.197.237]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E34762080D; Sun, 29 Nov 2020 03:23:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606620191; bh=sn3ZaidJ5F0KbO0pHK/J1lNtHU39WVWzKqMSf2zfPUY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=yCjAGNgbmdpq8O7V8eNE0n2m/kK/mz6uBDGwxmupAD+JcI7vsVTHjT5zSOhvZHtf4 UsOdua+HT7RXFPT0zGUsbum187X9MLEgl0ouGU6CN3BsQNYL9R0j3dgswceIgFbGao dYpGg2ysNd/3z3i/U85BV+YLybNIsllvXk4Pjq/g= Date: Sun, 29 Nov 2020 05:23:06 +0200 From: Jarkko Sakkinen To: Hans de Goede Cc: Jerry Snitselaar , Matthew Garrett , linux-integrity , Linux Kernel Mailing List , Peter Huewe , Jason Gunthorpe , James Bottomley Subject: Re: [PATCH] tpm_tis: Disable interrupts on ThinkPad T490s Message-ID: <20201129032306.GD39488@kernel.org> References: <20201015214430.17937-1-jsnitsel@redhat.com> <87d009c0pn.fsf@redhat.com> <20201124032623.GA40007@kernel.org> <871rgiod53.fsf@redhat.com> <7779bfbc-f96b-dd81-313f-36f451ce9c32@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7779bfbc-f96b-dd81-313f-36f451ce9c32@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 24, 2020 at 10:45:01PM +0100, Hans de Goede wrote: > Hi, > > On 11/24/20 6:52 PM, Jerry Snitselaar wrote: > > > > Jarkko Sakkinen @ 2020-11-23 20:26 MST: > > > >> On Wed, Nov 18, 2020 at 11:36:20PM -0700, Jerry Snitselaar wrote: > >>> > >>> Matthew Garrett @ 2020-10-15 15:39 MST: > >>> > >>>> On Thu, Oct 15, 2020 at 2:44 PM Jerry Snitselaar wrote: > >>>>> > >>>>> There is a misconfiguration in the bios of the gpio pin used for the > >>>>> interrupt in the T490s. When interrupts are enabled in the tpm_tis > >>>>> driver code this results in an interrupt storm. This was initially > >>>>> reported when we attempted to enable the interrupt code in the tpm_tis > >>>>> driver, which previously wasn't setting a flag to enable it. Due to > >>>>> the reports of the interrupt storm that code was reverted and we went back > >>>>> to polling instead of using interrupts. Now that we know the T490s problem > >>>>> is a firmware issue, add code to check if the system is a T490s and > >>>>> disable interrupts if that is the case. This will allow us to enable > >>>>> interrupts for everyone else. If the user has a fixed bios they can > >>>>> force the enabling of interrupts with tpm_tis.interrupts=1 on the > >>>>> kernel command line. > >>>> > >>>> I think an implication of this is that systems haven't been > >>>> well-tested with interrupts enabled. In general when we've found a > >>>> firmware issue in one place it ends up happening elsewhere as well, so > >>>> it wouldn't surprise me if there are other machines that will also be > >>>> unhappy with interrupts enabled. Would it be possible to automatically > >>>> detect this case (eg, if we get more than a certain number of > >>>> interrupts in a certain timeframe immediately after enabling the > >>>> interrupt) and automatically fall back to polling in that case? It > >>>> would also mean that users with fixed firmware wouldn't need to pass a > >>>> parameter. > >>> > >>> I believe Matthew is correct here. I found another system today > >>> with completely different vendor for both the system and the tpm chip. > >>> In addition another Lenovo model, the L490, has the issue. > >>> > >>> This initial attempt at a solution like Matthew suggested works on > >>> the system I found today, but I imagine it is all sorts of wrong. > >>> In the 2 systems where I've seen it, there are about 100000 interrupts > >>> in around 1.5 seconds, and then the irq code shuts down the interrupt > >>> because they aren't being handled. > >>> > >>> > >>> diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c > >>> index 49ae09ac604f..478e9d02a3fa 100644 > >>> --- a/drivers/char/tpm/tpm_tis_core.c > >>> +++ b/drivers/char/tpm/tpm_tis_core.c > >>> @@ -27,6 +27,11 @@ > >>> #include "tpm.h" > >>> #include "tpm_tis_core.h" > >>> > >>> +static unsigned int time_start = 0; > >>> +static bool storm_check = true; > >>> +static bool storm_killed = false; > >>> +static u32 irqs_fired = 0; > >> > >> Maybe kstat_irqs() would be a better idea than ad hoc stats. > >> > > > > Thanks, yes that would be better. > > > >>> + > >>> static void tpm_tis_clkrun_enable(struct tpm_chip *chip, bool value); > >>> > >>> static void tpm_tis_enable_interrupt(struct tpm_chip *chip, u8 mask) > >>> @@ -464,25 +469,31 @@ static int tpm_tis_send_data(struct tpm_chip *chip, const u8 *buf, size_t len) > >>> return rc; > >>> } > >>> > >>> -static void disable_interrupts(struct tpm_chip *chip) > >>> +static void __disable_interrupts(struct tpm_chip *chip) > >>> { > >>> struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > >>> u32 intmask; > >>> int rc; > >>> > >>> - if (priv->irq == 0) > >>> - return; > >>> - > >>> rc = tpm_tis_read32(priv, TPM_INT_ENABLE(priv->locality), &intmask); > >>> if (rc < 0) > >>> intmask = 0; > >>> > >>> intmask &= ~TPM_GLOBAL_INT_ENABLE; > >>> rc = tpm_tis_write32(priv, TPM_INT_ENABLE(priv->locality), intmask); > >>> + chip->flags &= ~TPM_CHIP_FLAG_IRQ; > >>> +} > >>> + > >>> +static void disable_interrupts(struct tpm_chip *chip) > >>> +{ > >>> + struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > >>> > >>> + if (priv->irq == 0) > >>> + return; > >>> + > >>> + __disable_interrupts(chip); > >>> devm_free_irq(chip->dev.parent, priv->irq, chip); > >>> priv->irq = 0; > >>> - chip->flags &= ~TPM_CHIP_FLAG_IRQ; > >>> } > >>> > >>> /* > >>> @@ -528,6 +539,12 @@ static int tpm_tis_send(struct tpm_chip *chip, u8 *buf, size_t len) > >>> int rc, irq; > >>> struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); > >>> > >>> + if (unlikely(storm_killed)) { > >>> + devm_free_irq(chip->dev.parent, priv->irq, chip); > >>> + priv->irq = 0; > >>> + storm_killed = false; > >>> + } > >> > >> OK this kind of bad solution because if tpm_tis_send() is not called, > >> then IRQ is never freed. AFAIK, devres_* do not sleep but use spin > >> lock, i.e. you could render out both storm_check and storm_killed. > >> > > > > Is there a way to flag it for freeing later while in an interrupt > > context? I'm not sure where to clean it up since devm_free_irq can't be > > called in tis_int_handler. > > You could add a workqueue work-struct just for this and queue that up > to do the free when you detect the storm. That will then run pretty much > immediately, avoiding the storm going on for (much) longer. That's sounds feasible. > > Before diving further into that though, does anyone else have an opinion > > on ripping out the irq code, and just using polling? We've been only > > polling since 2015 anyways. > > Given James Bottomley's reply I guess it would be worthwhile to get the > storm detection to work. OK, agreed. I take my words back from a response few minutes ago :-) > Regards, > > Hans /Jarkko