Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp1352134pxu; Mon, 23 Nov 2020 19:47:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJywHOUOnj/p3euZ9iZddhheA34R2BUDDsBGkV29veWPKu5WB6ichuuMoD0ESV85biIZfhaE X-Received: by 2002:a17:906:a1cb:: with SMTP id bx11mr798871ejb.508.1606189648030; Mon, 23 Nov 2020 19:47:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606189648; cv=none; d=google.com; s=arc-20160816; b=lZKYbdHK1uMbL4z2LwICR1lOzx06mYuOvwYYDSQlzedJrOPPK+/AFPa9+W91tCGwEG 8Tb53gpiKlyaGGVhFgqD2QGSyXkqELmOnR/tOMX/adgs5aT8zCQtKX40/VzCcsp3qgwJ MX0hUvg0uuqF+Pe1OgpyLuhboNwMQxE/qiK2Qh/ilT/j2bS4Qa6N/0O5X0RqiAf6IcK6 jMUPNyo8wwIWyKe5bX1WYzlLHx+6paMzpidA1+88qrqdXlrGC2UcTUv9PUOmITt470E5 AL7cyUyzjR1LxiszNNv9J8BV8c5E8vNC8yJ8l1jMnI1GyEftCYI3HaVGlN207ykEDu5E uhgQ== 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=xIbgAatB0pzfRBOhzeQ+PRAMN5matSlMuq9NGjGoGLE=; b=X7qYoD1Wl7kG8VNJRnnSMYziducFFkx/vJVttjaYOeI11l2iv6Fy/AsJkfhgQlxZxJ +hoQVddGiysgcHQLMt59yVkKy5FWuYwsUzEqF2X29/dRWe9JS/Dzck7a4IRbbpg7Ms6+ hl63iYsFoROZ3L4VrmqzYwSTpH5bplumGka0RM48+BO3oNGFMDiZosj516e/NLtELnbA ERFrTjiJgXbdQ26zCDWE2QMvgfoAQi8oKW1QpqeKxndPg2kbigDWr3Z0ldntaQKHjU0+ P1R/VsMCMzD/gCGcqngVw+fxNnM+cRl+IteYrklDf0HQicYWZlvWYF4IG3Cpf2qio6PU 6ZVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vzVbZQOP; 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 i88si4656834edd.322.2020.11.23.19.47.05; Mon, 23 Nov 2020 19:47:28 -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=vzVbZQOP; 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 S1726899AbgKXD0a (ORCPT + 99 others); Mon, 23 Nov 2020 22:26:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:41268 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725797AbgKXD0a (ORCPT ); Mon, 23 Nov 2020 22:26:30 -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 6A1BD2085B; Tue, 24 Nov 2020 03:26:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606188389; bh=ENoQzg08ZYx8Qu7RLQ7GkYk8S6fiD6IgUkEURzdL1rw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=vzVbZQOP7+CEPYjUeGWYeX1PY4vl6wllRdLRaNV3q+eaisI9mYL4AGTJ5YNBoNS/P fq8OknvuoJzAJ5JzadgTeW2s7PJ0VE0QfdnjT+DXAeguj7DHAAq6y4kl2jxxJtvwCC dAZ5Y49h2acEUsZiTZQE5ADIlqjmSF2Qs6OLlIXI= Date: Tue, 24 Nov 2020 05:26:23 +0200 From: Jarkko Sakkinen To: Jerry Snitselaar Cc: Matthew Garrett , linux-integrity , Linux Kernel Mailing List , Peter Huewe , Jason Gunthorpe , Hans de Goede , James Bottomley Subject: Re: [PATCH] tpm_tis: Disable interrupts on ThinkPad T490s Message-ID: <20201124032623.GA40007@kernel.org> References: <20201015214430.17937-1-jsnitsel@redhat.com> <87d009c0pn.fsf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87d009c0pn.fsf@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. > + > 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. > + > if (!(chip->flags & TPM_CHIP_FLAG_IRQ) || priv->irq_tested) > return tpm_tis_send_main(chip, buf, len); > > @@ -748,6 +765,21 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id) > u32 interrupt; > int i, rc; > > + if (storm_check) { > + irqs_fired++; > + > + if (!time_start) { > + time_start = jiffies_to_msecs(jiffies); > + } else if ((irqs_fired > 1000) && (jiffies_to_msecs(jiffies) - jiffies < 500)) { > + __disable_interrupts(chip); > + storm_check = false; > + storm_killed = true; > + return IRQ_HANDLED; > + } else if ((jiffies_to_msecs(jiffies) - time_start > 500) && (irqs_fired < 1000)) { > + storm_check = false; > + } > + } > + > rc = tpm_tis_read32(priv, TPM_INT_STATUS(priv->locality), &interrupt); > if (rc < 0) > return IRQ_NONE; > > /Jarkko