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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 A03EAC3A5A6 for ; Sun, 22 Sep 2019 19:02:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E8A921907 for ; Sun, 22 Sep 2019 19:02:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178929; bh=ShkHZbdkeYGi6+KaL0/7gVGfrQBtWi52h4/mpWlR4+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=v2zGNNA6CA21qiE42GWJJxFo57tC3+L4vK+AH1iKodrxE69czfmxsCSPrEPC9D1cj fAVxaEHuhnM2rPbZrSp1kjxZO3Xoo5a/OnCmxpc8f8t4nOhAXJexSuVxJBHxVjIGOi TzSse3BdJeBjxiwynuMLFcV9a1epAnh1OPTAKKTQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395406AbfIVTCI (ORCPT ); Sun, 22 Sep 2019 15:02:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:38368 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395363AbfIVTCB (ORCPT ); Sun, 22 Sep 2019 15:02:01 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 53BBA21A4A; Sun, 22 Sep 2019 19:02:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178921; bh=ShkHZbdkeYGi6+KaL0/7gVGfrQBtWi52h4/mpWlR4+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OI2uoCUoNQD7k0FDqfFPMTncj7pw0FgEjROLL2eu5SUlMJah4YM9tLP70/8xu8pKQ /NEMkLZ4DIAe2Wr2XsqUeHO5HVxwBj5vw1x8Qszm5Uh6tI7JWrfhfo8AMb/d8/v6Al 374NLmscI1RtX9YjuRhdwYJ8guOFypXGJT2kvSl0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Marc Zyngier , Jiaxing Luo , John Garry , Sasha Levin Subject: [PATCH AUTOSEL 4.4 37/44] irqchip/gic-v3-its: Fix LPI release for Multi-MSI devices Date: Sun, 22 Sep 2019 15:00:55 -0400 Message-Id: <20190922190103.4906-37-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922190103.4906-1-sashal@kernel.org> References: <20190922190103.4906-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 114d5883d4978..cf11d43ce2416 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -1372,14 +1372,13 @@ static void its_irq_domain_free(struct irq_domain *domain, unsigned int virq, struct its_device *its_dev = irq_data_get_irq_chip_data(d); 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