From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CC701714D0; Thu, 15 Aug 2024 13:30:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723728632; cv=none; b=WfHs+1Fzqi9mTpQxXdOYtkhuGpTJwmMA6ID4r0xtSFrgPa9aShxkoMbact08UAIAuCVG9OIUsbX/cmaOviUoMSh0KWtNvhXaT35UXOzkrF8ZyyJIDy5hVy8TwX+ldMDUubmct3ql0IAJy+ila9sug+FoFQrTiVJ+Ri1xGAU2rxs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723728632; c=relaxed/simple; bh=79mAW10kLEx27krBKASFmqC6eukB7dBofVbTFfGOiaM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tVFLPXhqPbXAK0ICK5ltyfcsUSNf699pBryyLKLJDkd3mkRlazicXuZcWmPupdwFfYUZnWipA24g80I4CR0sWMJe+b85DqJNVHXvXNlHVY3YBlL1ScwafSM6H9aoT8zBC5BcVUoaXFwe7w+DSwquH+2bIJ9/08mYP2sJ5IssChg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mOSNB7f3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mOSNB7f3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B965C32786; Thu, 15 Aug 2024 13:30:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723728630; bh=79mAW10kLEx27krBKASFmqC6eukB7dBofVbTFfGOiaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mOSNB7f3cbG5xfyujSoG2DkpgZfR915PsqhdS5FpSMVr+BiesCNfHo/ZXJ/5DTvHk pD3LkwqFECUgN/gIzrVzYQYlIJwFNBVZzndPnxXbBsLpGSRx80dZHNLMGsABqU2HoR SReS0qo26BqZT+mIG6uNC+iuqQjyjMU4zEDCj10s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lidong Wang , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Bjorn Helgaas , Mika Westerberg , Sasha Levin Subject: [PATCH 4.19 043/196] PCI: Fix resource double counting on remove & rescan Date: Thu, 15 Aug 2024 15:22:40 +0200 Message-ID: <20240815131853.731744219@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240815131852.063866671@linuxfoundation.org> References: <20240815131852.063866671@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ilpo Järvinen [ Upstream commit 903534fa7d30214d8ba840ab1cd9e917e0c88e41 ] pbus_size_mem() keeps the size of the optional resources in children_add_size. When calculating the PCI bridge window size, calculate_memsize() lower bounds size by old_size before adding children_add_size and performing the window size alignment. This results in double counting for the resources in children_add_size because old_size may be based on the previous size of the bridge window after it has already included children_add_size (that is, size1 in pbus_size_mem() from an earlier invocation of that function). As a result, on repeated remove of the bus & rescan cycles the resource size keeps increasing when children_add_size is non-zero as can be seen from this extract: iomem0: 23fffd00000-23fffdfffff : PCI Bus 0000:03 # 1MiB iomem1: 20000000000-200001fffff : PCI Bus 0000:03 # 2MiB iomem2: 20000000000-200002fffff : PCI Bus 0000:03 # 3MiB iomem3: 20000000000-200003fffff : PCI Bus 0000:03 # 4MiB iomem4: 20000000000-200004fffff : PCI Bus 0000:03 # 5MiB Solve the double counting by moving old_size check later in calculate_memsize() so that children_add_size is already accounted for. After the patch, the bridge window retains its size as expected: iomem0: 23fffd00000-23fffdfffff : PCI Bus 0000:03 # 1MiB iomem1: 20000000000-200000fffff : PCI Bus 0000:03 # 1MiB iomem2: 20000000000-200000fffff : PCI Bus 0000:03 # 1MiB Fixes: a4ac9fea016f ("PCI : Calculate right add_size") Link: https://lore.kernel.org/r/20240507102523.57320-2-ilpo.jarvinen@linux.intel.com Tested-by: Lidong Wang Signed-off-by: Ilpo Järvinen Signed-off-by: Bjorn Helgaas Reviewed-by: Mika Westerberg Signed-off-by: Sasha Levin --- drivers/pci/setup-bus.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 7f58360b42b7e..7f866c3f036fe 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -807,11 +807,9 @@ static resource_size_t calculate_memsize(resource_size_t size, size = min_size; if (old_size == 1) old_size = 0; - if (size < old_size) - size = old_size; - size = ALIGN(max(size, add_size) + children_add_size, align); - return size; + size = max(size, add_size) + children_add_size; + return ALIGN(max(size, old_size), align); } resource_size_t __weak pcibios_window_alignment(struct pci_bus *bus, -- 2.43.0