Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795056016; b=luASfC/IHLMVuVE6Aw5dLiDMFDatNQEFT1mBeMuPW5icCyUx3zgjy+lB4tZRy+pCjly2 QZCsS092XdAa0NESmLxz31VaOx27qUiP5+Ci2X5oNeuT1CYSYVVj6OlPIraS5hutgIAEW 0UjzTZGmFwmBhUn8bR+rtHIR8Zmr7U4osy6HgqRZzzTxVgjCLMbTg7oiFbA2gf5JmZ3uM 5kzu48hbhdChYqi9leX/MF9gAPp5ll7R079F1RZd8sWjSu/S8wHCOazbKfzpEj2eg0zTs 5zbVFnH6PDiGSu1v8weJdbk3Ca5LWD3XXlX0wG+7WLV3di13K5qSVW9U6YeJU628z5Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795056016; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=WM1LHiPTKG4EavUz5It+sd8nMXHfLhThd/4dX9HZ9oA=; b=5DfviC2ZSoAMCfwv7EQKxfbzgDKumr8/vgRz6AxsanXpVBvGQ4IskddEGlsw+Kv5f041 Oli1y8/gruJr+ak0RUGIwaeeJOsMty5vWbd70+ytQtaFMRyrD+MLMtF7Nm74iRE0YdCDw 8KJwXKAORAvfaTyduW5BjOQ0z8P9ReksCFpISUfk4ieozU8gLmmX3luy2tUqJp+yKtnlg dMCXq8NdR2pdY/IXwvl5/Zhcor+GMcsNkdA0P1/jEWaPfgjtW07kq1YG/Wajz8mlRMlAN HOHaRUb7JjXozLIoTLMqrBT24qpgl4Czwzf7+xm/GNL450pDYYs+R49LwQC0do0jwlw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Q9MyU6c8; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DFBE1606A325; Thu, 19 Nov 2026 02:40:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Q9MyU6c8 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10B771F000C9; Thu, 19 Nov 2026 02:40:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795056015; bh=WM1LHiPTKG4EavUz5It+sd8nMXHfLhThd/4dX9HZ9oA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Q9MyU6c8fQwpUys9cBSy2tvmu/tdVAh5FX/3iNXaVGSJu3UfZn6WqugMAURgfU6v0 IWDqU/VcgsKk//OMYq8la29aqy20f+wOkarf2mvFR1yd8vEmbV7aZp4w8VuqO/Lx0z qrTOXXJhLURkWQIIu+ICk3UVz40VJbEuVWarFOTY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Leon Romanovsky , Bjorn Helgaas , Tushar Dave , Jason Gunthorpe , Logan Gunthorpe , Sasha Levin Subject: [PATCH 5.15 1837/2214] PCI/P2PDMA: Gate the host bridge whitelist warning on verbose Date: Wed, 18 Nov 2026 15:58:33 +0100 Message-ID: <20261118150124.920580042@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Leon Romanovsky [ Upstream commit 36038f0e8377ef316b723d0d85b1510bc64069ab ] calc_map_type_and_dist() prints every other diagnostic under its verbose argument, but reaches the "Host bridge not in P2PDMA whitelist" warning through host_bridge_whitelist(), which it hands acs_redirects instead. A caller that asked for a silent answer still gets the warning whenever any port on the path has an ACS redirect bit set, the CPU is not whitelisted by cpu_supports_p2pdma(), and the host bridge is not in pci_p2pdma_whitelist[]. pci_p2pmem_find_many() is such a caller. It sweeps every device with published p2pmem and asks for the distance to each client with verbose=false, and pci_p2pdma_distance_many() recomputes rather than consulting the map_types cache, so the warning repeats on every sweep. The argument was never meant to say "ACS redirects were found". When commit cf201bfe8cdc ("PCI/P2PDMA: Warn if host bridge not in whitelist") added it, acs_redirects was a bool pointer that the quiet entry point passed as NULL: if (verbose) map = calc_map_type_and_dist_warn(provider, pci_client, &distance); else map = calc_map_type_and_dist(provider, pci_client, &distance, NULL, NULL); so the argument was true on exactly the path that commit describes. Folding the two entry points into one verbose flag turned the pointer into a value and left the call site alone, silently narrowing the warning to paths that carry an ACS redirect. Pass verbose. This also restores the warning for a verbose caller that takes the host bridge route with no ACS redirect on the path, which until now was told it could not use peer-to-peer DMA without being told which vendor and device would have to be added to the whitelist. Fixes: d1b8dc09dd71 ("PCI/P2PDMA: Simplify distance calculation") Signed-off-by: Leon Romanovsky Signed-off-by: Bjorn Helgaas Tested-by: Tushar Dave Reviewed-by: Jason Gunthorpe Reviewed-by: Logan Gunthorpe Link: https://patch.msgid.link/20260830-batch-p2p-fixes-v1-5-5044e8dfbe2e@nvidia.com Signed-off-by: Sasha Levin --- drivers/pci/p2pdma.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c index 1663a8e2c4174..c175a87eefcb7 100644 --- a/drivers/pci/p2pdma.c +++ b/drivers/pci/p2pdma.c @@ -452,7 +452,6 @@ calc_map_type_and_dist(struct pci_dev *provider, struct pci_dev *client, { enum pci_p2pdma_map_type map_type = PCI_P2PDMA_MAP_THRU_HOST_BRIDGE; struct pci_dev *a = provider, *b = client, *bb; - bool acs_redirects = false; struct pci_p2pdma *p2pdma; struct seq_buf acs_list; int acs_cnt = 0; @@ -523,11 +522,10 @@ calc_map_type_and_dist(struct pci_dev *provider, struct pci_dev *client, pci_warn(client, "to disable ACS redirect for this path, add the kernel parameter: pci=disable_acs_redir=%s\n", seq_buf_str(&acs_list)); } - acs_redirects = true; map_through_host_bridge: if (!cpu_supports_p2pdma() && - !host_bridge_whitelist(provider, client, acs_redirects)) { + !host_bridge_whitelist(provider, client, verbose)) { if (verbose) pci_warn(client, "cannot be used for peer-to-peer DMA as the client and provider (%s) do not share an upstream bridge or whitelisted host bridge\n", pci_name(provider)); -- 2.53.0