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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 E6547C32792 for ; Thu, 3 Oct 2019 16:07:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D4BF222C2 for ; Thu, 3 Oct 2019 16:07:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118822; bh=vVO98uKnCrWzvCx0/1+0fFpO60BbjWNePNjbmaUcMxM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gXaIRB95ymaZoy1gpA/d3Cnbb4YtMmtd/1zE3x8nSsZum3DAPq6BqmXarGBYVaX4A /4CK7Q0s0Gkb8WVz3XvZcLmXpFKayFS+5OFautcOcXpOjRrL9Ap2e64NaSaDQPmYRo iDSMSJ3LXaBfLDdoVms/q7eVViDBT0lpcJY1802U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731487AbfJCQHB (ORCPT ); Thu, 3 Oct 2019 12:07:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:54588 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731841AbfJCQHB (ORCPT ); Thu, 3 Oct 2019 12:07:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 ACC7020865; Thu, 3 Oct 2019 16:06:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118820; bh=vVO98uKnCrWzvCx0/1+0fFpO60BbjWNePNjbmaUcMxM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O8l/u1svfPn4bX2Wc4P2DPRdElOH0ZVrmPGOpP2pYCEDfCkls+sIJ7FSEePl2UEz6 T/8ylUr4m5094RZeRntvhTSkCJ4atWcTplS79XdODF2usJEv/qfDdtklyp51KCZ1ab UPbum9YmkmzLJ8ReHEjam+E0K4CULEALdmLw3iHg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiaxing Luo , John Garry , Marc Zyngier , Sasha Levin Subject: [PATCH 4.14 021/185] irqchip/gic-v3-its: Fix LPI release for Multi-MSI devices Date: Thu, 3 Oct 2019 17:51:39 +0200 Message-Id: <20191003154442.497231363@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154437.541662648@linuxfoundation.org> References: <20191003154437.541662648@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marc Zyngier [ Upstream commit c9c96e30ecaa0aafa225aa1a5392cb7db17c7a82 ] When allocating a range of LPIs for a Multi-MSI capable device, this allocation extended to the closest power of 2. But on the release path, the interrupts are released one by one. This results in not releasing the "extra" range, leaking the its_device. Trying to reprobe the device will then fail. Fix it by releasing the LPIs the same way we allocate them. Fixes: 8208d1708b88 ("irqchip/gic-v3-its: Align PCI Multi-MSI allocation on their size") Reported-by: Jiaxing Luo Tested-by: John Garry Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/f5e948aa-e32f-3f74-ae30-31fee06c2a74@huawei.com Signed-off-by: Sasha Levin --- drivers/irqchip/irq-gic-v3-its.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index f80666acb9efd..52238e6bed392 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -2269,14 +2269,13 @@ static void its_irq_domain_free(struct irq_domain *domain, unsigned int virq, struct its_node *its = its_dev->its; int i; + bitmap_release_region(its_dev->event_map.lpi_map, + its_get_event_id(irq_domain_get_irq_data(domain, virq)), + get_count_order(nr_irqs)); + for (i = 0; i < nr_irqs; i++) { struct irq_data *data = irq_domain_get_irq_data(domain, virq + i); - u32 event = its_get_event_id(data); - - /* Mark interrupt index as unused */ - clear_bit(event, its_dev->event_map.lpi_map); - /* Nuke the entry in the domain */ irq_domain_reset_irq_data(data); } -- 2.20.1