From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DE09C11F66 for ; Tue, 29 Jun 2021 13:25:58 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 02B0D61D7B for ; Tue, 29 Jun 2021 13:25:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 02B0D61D7B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+gcOJA81KKqU22uyDDhm0tCrXc81UXT0D/5Pzb1vP2U=; b=z9iJfhhU1CQFMd HP9grwYH1KKVxk0+KF3zkiSqFiQFaPxVRSoCqEjPWad3EO/r2MR1z18r6uVAsoNtWiRFgMO23gZam 4FBEbI0eTBIuGr3uW2oqOzZkYOcxq934brKG+jsYxQ2npKsN12ks6QWjC/Amekv6Ptnt7tnc8GmaI wF/+bO+EmHlrYnzSiX8iJmMPbtriOLnCmRedNG971KU+taSHgqAalz+i3QfncbP5TAypi4EHjwg7/ cs994HkjarN5xbBOuqU4P49fjTwXmJoQeIE7pYPeJ4ti4+mKuEdnKzCvK8CPFqdzCFPRe1hFwpKMv kXaxUAKcwcAThIUUdC9w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyDiV-00B0OL-4E; Tue, 29 Jun 2021 13:23:55 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lyDCf-00At20-9j for linux-arm-kernel@lists.infradead.org; Tue, 29 Jun 2021 12:51:03 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CF188143B; Tue, 29 Jun 2021 05:50:53 -0700 (PDT) Received: from e113632-lin.cambridge.arm.com (e113632-lin.cambridge.arm.com [10.1.194.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id CEFB53F718; Tue, 29 Jun 2021 05:50:52 -0700 (PDT) From: Valentin Schneider To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Marc Zyngier , Thomas Gleixner , Lorenzo Pieralisi , Vincenzo Frascino Subject: [PATCH v3 06/13] genirq: Don't mask IRQ within flow handler if IRQ is flow-masked Date: Tue, 29 Jun 2021 13:50:03 +0100 Message-Id: <20210629125010.458872-7-valentin.schneider@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210629125010.458872-1-valentin.schneider@arm.com> References: <20210629125010.458872-1-valentin.schneider@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210629_055101_470616_4268B5F6 X-CRM114-Status: GOOD ( 14.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org mask_irq() lets an IRQ with IRQD_IRQ_FLOW_MASKED set be further masked via chip->irq_mask(). This is necessary for unhandled IRQs as we want to keep them masked beyond eoi_irq() (which clears IRQD_IRQ_FLOW_MASKED). This is however not necessary in paths that do end up handling the IRQ and are bounded by a final eoi_irq() - this is the case for chips with IRQCHIP_AUTOMASKS_FLOW and IRQCHIP_EOI_THREADED. Make handle_strict_flow_irq() leverage IRQCHIP_AUTOMASKS_FLOW and issue an ack_irq() rather than a mask_ack_irq() when possible. Signed-off-by: Valentin Schneider --- kernel/irq/chip.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 699e70b51aae..c2ca6b748987 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -896,6 +896,12 @@ void handle_edge_eoi_irq(struct irq_desc *desc) } #endif +/* + * AUTOMASKS_FLOW tells us ack/eoi handle the masking, EOI_THREADED tells us + * that masking will persist until irq_finalize_oneshot() + */ +#define ONESHOT_AUTOMASK_FLAGS (IRQCHIP_AUTOMASKS_FLOW | IRQCHIP_EOI_THREADED) + /** * handle_strict_flow_irq - irq handler for strict controllers * @desc: the interrupt description structure for this irq @@ -909,10 +915,9 @@ void handle_strict_flow_irq(struct irq_desc *desc) struct irq_chip *chip = desc->irq_data.chip; raw_spin_lock(&desc->lock); - mask_ack_irq(desc); if (!irq_may_run(desc)) - goto out; + goto out_mask; desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING); @@ -922,10 +927,20 @@ void handle_strict_flow_irq(struct irq_desc *desc) */ if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data))) { desc->istate |= IRQS_PENDING; - goto out; + goto out_mask; } kstat_incr_irqs_this_cpu(desc); + /* + * Masking is required if IRQ is ONESHOT and we can't rely on the + * flow-masking persisting down to irq_finalize_oneshot() + * (in the IRQ thread). + */ + if ((desc->istate & IRQS_ONESHOT) && + ((chip->flags & ONESHOT_AUTOMASK_FLAGS) != ONESHOT_AUTOMASK_FLAGS)) + mask_ack_irq(desc); + else + ack_irq(desc); handle_irq_event(desc); @@ -933,7 +948,8 @@ void handle_strict_flow_irq(struct irq_desc *desc) raw_spin_unlock(&desc->lock); return; -out: +out_mask: + mask_ack_irq(desc); /* * XXX: this is where IRQCHIP_EOI_IF_HANDLED would be checked, but * it's conceptually incompatible with this handler (it breaks the -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel