From patchwork Wed Aug 14 12:09:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miao Wang via B4 Relay X-Patchwork-Id: 13763415 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 C492B1AC43D; Wed, 14 Aug 2024 12:09:18 +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=1723637358; cv=none; b=m/XaNJNYusRwVkc5JViBfW+xzmgYIbZuH1Ghmkc1ZHfB8V/uChFOsq0hdQPQmwPUS+3zAgWsuKS0+giYjCYhgduUgCTVBxennbK/UF2CD0HGBPDZ1CT2maHZ3turnkfGRMm8BePVFwhgo5z4h7wHm404uT6O/uoXNHHd4aeIeIQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723637358; c=relaxed/simple; bh=xlfWgzKDkuKv1C0s0YOZ4CXTd4OnPGuxZGUNwfZUY0g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=TSRPif4XIssv3UAheugyYSKf+7DO2AmN2UjTSyrhSV807PYK0tSuDZ6gsHoHhPgKoxG12IZJ8nkkPzc6zscAg52TM1w27UUumPjxiasyJOus4SXaMBjjCgLO4EzcnxcxtgNG6FmXYihPc1l3lvud6hvYWLq9VfXuJVVwEXq72xY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MgjNepPV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MgjNepPV" Received: by smtp.kernel.org (Postfix) with ESMTPS id 9852EC32786; Wed, 14 Aug 2024 12:09:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723637358; bh=xlfWgzKDkuKv1C0s0YOZ4CXTd4OnPGuxZGUNwfZUY0g=; h=From:Date:Subject:To:Cc:Reply-To:From; b=MgjNepPVWjJ+N/hSvJhguEja90bnkFN0GyconPb/wlg6umFM3no5p/wcZZlZndasW 8HOj74vJMpSkmd8Qd6dOYT4zcbfSuEwys36CGnwqe6Z0nfVIMmO9srPQhBsTuWDi73 vN1olpgeIUVqjT8OaTqeS2xSsAZXxe3moA79GXXxzcyvdLiOFaC8jk+I8AsPQMIwAS X0TtZ/AafY0DNLS0YtpCT7f0PgnM97IkqtkvO5YewSJKhU9dUkA51FBNOnR+c7qU/q GkDihFODg6/GiSWoIcUCwz8hjDJ+YFIWdgBZwXcateqmoLoiikP1mbwfKZuETaq/bZ RH07TLrC5L66Q== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7727CC3DA4A; Wed, 14 Aug 2024 12:09:18 +0000 (UTC) From: Miao Wang via B4 Relay Date: Wed, 14 Aug 2024 20:09:15 +0800 Subject: [PATCH v3] ACPI: PCI: check if the root io space is page aligned Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240814-check_pci_probe_res-v3-1-b6eaa6f99032@gmail.com> X-B4-Tracking: v=1; b=H4sIAGqevGYC/43NwQrCMAyA4VeRnq206XCdJ99DZLRdtgXdOlopy ti72w08CB4kpz+QLzOLGAgjO+1mFjBRJD/mUPsdc70ZO+TU5GYgoBBaKu56dLd6clRPwVusA0Y OJSo8Nm0JFli+nAK29NzUyzV3T/Hhw2t7kuS6/XjFTy9JngcAUZQapLHnbjB0Pzg/sNVL8IcB2 TBCOe0qW1T6y1iW5Q2WAXdS+gAAAA== To: =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Bjorn Helgaas , "Rafael J. Wysocki" , Len Brown Cc: linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, Miao Wang X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=2630; i=shankerwangmiao@gmail.com; h=from:subject:message-id; bh=6oaDNHVrPEVfrCvEohkLob23Ms2FvyIxaW/2/yHOdZk=; b=owEBbQKS/ZANAwAKAbAx48p7/tluAcsmYgBmvJ5s3R3lWYU++7rDe2YItFtoK9N19W9fB8rFh +JIF/fxAUmJAjMEAAEKAB0WIQREqPWPgPJBxluezBOwMePKe/7ZbgUCZryebAAKCRCwMePKe/7Z buu7D/0RUBWCuBb/D16VR1j48OX8MdQFr3MObTJy3QPPNy0Frv+Um02juwAU1oiYtuj//VGhmOo 2OcUjRRfgXtxGU4IMr4iejr9831igP+Zsk4xcm8stA3bbTY9ogo28RdVwKG2L+VBOLfndG5PPuK yNErQUOAsDBVb4ep+r2CRiy37nfh9eZfbyxyosCarQZ31Svdt5RjbmR8iUYGxyGL3qYAMdVKapi mVLJijvvpg4Zo7FmE0PADOE2Sqr1RvM/nRrJu62CR+Z9Mn4Tc/N6qZoAp+jBEvNfAjeuvmziWXJ JxxCio+kHESbt1y8gB5zHkzy03JcRBuAk4m1T64wkmmhb39pKQuPoc30QUbyHQj8/iJ1zEatEJl gpeK0kzFsK0RfSrowh0vP7QrNAwMONZ4TDbYQfkZ3kGnoUFtdWnqiqojMZWzNF1Xf8irOd68UST vVUEO/zcuQgcZe/Bzymeo9EA3UH0Jzl+JTfRcTm2aRaZYbWBZSK1aKj+lHNCDVKNaylachEhpq+ DkqBQ3qgtZFq/qdwK88j5KdRU8veIOxc9dGk0oM8//Mzz0BIdBx6yEHGAUUwja20dQUaDYmlDtO s9OBDGHfPtTAEgW3BmQD01VFV+J9a3U0uyvCD1+NGoVqzri7xJHnd4Lvhy0/ISvhVTJlSKLEYqC o6ly6PS1nboHxZg== X-Developer-Key: i=shankerwangmiao@gmail.com; a=openpgp; fpr=6FAEFF06B7D212A774C60BFDFA0D166D6632EF4A X-Endpoint-Received: by B4 Relay for shankerwangmiao@gmail.com/default with auth_id=189 X-Original-From: Miao Wang Reply-To: shankerwangmiao@gmail.com From: Miao Wang When the IO resource given by _CRS method is not page aligned, especially when the page size is larger than 4KB, serious problems will happen because the misaligned address is passed down to pci_remap_iospace(), then to vmap_page_range(), and finally to vmap_pte_range(), where the length between addr and end is expected to be divisible by PAGE_SIZE, or the loop will overrun till the pfn_none check fails. Signed-off-by: Miao Wang --- Changes in v3: - Adjust code formatting. - Reword the commit message for further description of the possible reason leading to misaligned IO resource addresses. - Link to v2: https://lore.kernel.org/r/20240814-check_pci_probe_res-v2-1-a03c8c9b498b@gmail.com Changes in v2: - Sorry for posting out the draft version in V1, fixed a silly compiling issue. - Link to v1: https://lore.kernel.org/r/20240814-check_pci_probe_res-v1-1-122ee07821ab@gmail.com --- drivers/acpi/pci_root.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) --- base-commit: 7c626ce4bae1ac14f60076d00eafe71af30450ba change-id: 20240813-check_pci_probe_res-27e3e6df72b2 Best regards, diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index d0bfb3706801..a425e93024f2 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -858,7 +858,7 @@ static void acpi_pci_root_validate_resources(struct device *dev, } } -static void acpi_pci_root_remap_iospace(struct fwnode_handle *fwnode, +static void acpi_pci_root_remap_iospace(struct acpi_device *device, struct resource_entry *entry) { #ifdef PCI_IOBASE @@ -868,7 +868,15 @@ static void acpi_pci_root_remap_iospace(struct fwnode_handle *fwnode, resource_size_t length = resource_size(res); unsigned long port; - if (pci_register_io_range(fwnode, cpu_addr, length)) + if (!PAGE_ALIGNED(cpu_addr) || !PAGE_ALIGNED(length) || + !PAGE_ALIGNED(pci_addr)) { + dev_err(&device->dev, + FW_BUG "I/O resource %pR or its offset %pa is not page aligned\n", + res, &entry->offset); + goto err; + } + + if (pci_register_io_range(&device->fwnode, cpu_addr, length)) goto err; port = pci_address_to_pio(cpu_addr); @@ -910,7 +918,7 @@ int acpi_pci_probe_root_resources(struct acpi_pci_root_info *info) else { resource_list_for_each_entry_safe(entry, tmp, list) { if (entry->res->flags & IORESOURCE_IO) - acpi_pci_root_remap_iospace(&device->fwnode, + acpi_pci_root_remap_iospace(device, entry); if (entry->res->flags & IORESOURCE_DISABLED)