From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 2E8DA448D18; Thu, 6 Aug 2026 11:26:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786015581; cv=none; b=i/PYgwwVcqm8BzDbIkVe5eD+9lO7Qeglxa/tHtZaP9905p1QQMkAWOhq+zZ0Uz+2z02rUTAx3xk/N+zzeKpbhMUe9+yEX9Ju7SFCn6XCuz4CxLmnEoemy8YZawp9/c+RwRz3/269vgwfg1pBP2e52M2vltNxLSwd4DPlyI65dYo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786015581; c=relaxed/simple; bh=xu7bKRo5RLOqBjK5bDL/T/Kebb6ZO73Tv2zy4XFJYbY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dYfMW/qTgQwe8FSeelEc9A3k93fhCdYp4SzWbhq1YQKG7w4UKTveIUG+3Spgik6ARYhvm0o85BoTZ6+bDNNQpa4YjNVaq0xMfWjvfz3sPeczr43AT4xsToaPKQv/QsgjpaiJlCjHSIluRSP3ulnUJa9EWyRQKVh3Uu2CI8yGgP8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PEJVpLDF; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PEJVpLDF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3BCB1F000E9; Thu, 6 Aug 2026 11:26:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1786015579; bh=Z0pIvbWo9F46ShccSQVXE4zIzpt48rOwf1cluc8Lgss=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PEJVpLDF9+0TaXoAJZ0YslhtOjKIxBbnA6vlbHnqmBOPojd91sRw1QiatFnqza16n 0mbyfTzmHMovuvyy8mxjmyN9SCvFchMh27QHm7XGOOwG7Yi9c8Dy939OnbmTdtLhlO rAUSdvsdp/x+im4PKULDXQq9yBcmsSP5UGtoRf7OZxV7Omo9kKAwhJMynsT6jEXY2I eQeaHxiRYUxsL1s7YsSZO+aORNKXkIOcXYPmuKTN1cn7+OBxrsmD79iUAiinYwY5/R Mq5yCSGPJrz4EDMY1BPx/SeEVvCFUH/UFmLSG2BsxVmcSa3oXae4as0XeLmAKte4bR ZyZAv5ZWSV7XA== From: Leon Romanovsky To: Bjorn Helgaas , Logan Gunthorpe , Jonathan Corbet , Shuah Khan , Alex Williamson Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH v2 07/13] PCI/P2PDMA: Derive peer-to-peer routing from ACS control bits Date: Thu, 6 Aug 2026 14:24:14 +0300 Message-ID: <20260806-fix-p2p-acs-v2-7-0cec14812965@nvidia.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260806-fix-p2p-acs-v2-0-0cec14812965@nvidia.com> References: <20260806-fix-p2p-acs-v2-0-0cec14812965@nvidia.com> Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.15-dev-18f8f Content-Transfer-Encoding: 8bit From: Leon Romanovsky The redirect test reports an upstream redirect for any ACS redirect or egress control bit. PCIe r7.0, sec 6.12.3, table 6-11 ties the outcome to the control bits and the target vector, and an enabled egress control bit alone does not redirect. Compute the result from the control bits so the vector can be honored next, using the host-bridge route while the peer target is unknown. Reviewed-by: Logan Gunthorpe Signed-off-by: Leon Romanovsky --- drivers/pci/p2pdma.c | 49 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c index 801c183ae6b7..079cec6c0509 100644 --- a/drivers/pci/p2pdma.c +++ b/drivers/pci/p2pdma.c @@ -21,6 +21,8 @@ #include #include +#include "pci.h" + struct pci_p2pdma { struct gen_pool *pool; bool p2pmem_published; @@ -489,26 +491,45 @@ static struct pci_dev *find_parent_pci_dev(struct device *dev) return NULL; } -/* - * Check if a PCI bridge has its ACS redirection bits set to redirect P2P - * TLPs upstream via ACS. Returns 1 if the packets will be redirected - * upstream, 0 otherwise. - */ -static int pci_bridge_has_acs_redir(struct pci_dev *pdev) +enum pci_acs_p2pdma_state { + PCI_ACS_P2PDMA_DIRECT, + PCI_ACS_P2PDMA_REDIRECT, +}; + +static enum pci_acs_p2pdma_state +pci_acs_p2pdma_state(struct pci_dev *pdev, struct pci_dev *target) { int pos; u16 ctrl; pos = pdev->acs_cap; if (!pos) - return 0; + return PCI_ACS_P2PDMA_DIRECT; - pci_read_config_word(pdev, pos + PCI_ACS_CTRL, &ctrl); + if (pci_read_config_word(pdev, pos + PCI_ACS_CTRL, &ctrl)) + return PCI_ACS_P2PDMA_REDIRECT; - if (ctrl & (PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_EC)) - return 1; + if (!(ctrl & PCI_ACS_EC)) + return ctrl & (PCI_ACS_RR | PCI_ACS_CR) ? + PCI_ACS_P2PDMA_REDIRECT : PCI_ACS_P2PDMA_DIRECT; - return 0; + /* + * The vector cannot be read without the peer target, so redirect + * upstream until the paths diverge. + */ + if (!target) + return PCI_ACS_P2PDMA_REDIRECT; + + /* + * PCIe r7.0, sec 6.12.3, table 6-11: a set or indeterminate egress + * control vector bit keeps the request off the direct path; a clear + * bit permits it, subject only to completion redirect. + */ + if (pci_acs_egress_ctrl_set(pdev, target)) + return PCI_ACS_P2PDMA_REDIRECT; + + return ctrl & PCI_ACS_CR ? PCI_ACS_P2PDMA_REDIRECT : + PCI_ACS_P2PDMA_DIRECT; } static void seq_buf_print_bus_devfn(struct seq_buf *buf, struct pci_dev *pdev) @@ -722,7 +743,8 @@ calc_map_type_and_dist(struct pci_dev *provider, struct pci_dev *client, while (a) { dist_b = 0; - if (pci_bridge_has_acs_redir(a)) { + if (pci_acs_p2pdma_state(a, NULL) == + PCI_ACS_P2PDMA_REDIRECT) { seq_buf_print_bus_devfn(&acs_list, a); acs_cnt++; } @@ -755,7 +777,8 @@ calc_map_type_and_dist(struct pci_dev *provider, struct pci_dev *client, if (a == bb) break; - if (pci_bridge_has_acs_redir(bb)) { + if (pci_acs_p2pdma_state(bb, NULL) == + PCI_ACS_P2PDMA_REDIRECT) { seq_buf_print_bus_devfn(&acs_list, bb); acs_cnt++; } -- 2.55.0