mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v3 0/2] PCI/CXL: Guard device accesses during reset recovery
@ 2026-11-16  6:52 Richard Cheng
  2026-11-16  6:52 ` [PATCH v3 1/2] PCI/MSI: Skip MSI/MSI-X restoration when config space is inaccessible Richard Cheng
  2026-11-16  6:52 ` [PATCH v3 2/2] cxl/pci: Guard decoder accesses after reset Richard Cheng
  0 siblings, 2 replies; 4+ messages in thread
From: Richard Cheng @ 2026-11-16  6:52 UTC (permalink / raw)
  To: dave, jic23, dave.jiang, alison.schofield, vishal.l.verma, helgaas
  Cc: iweiny, ming.li, icheng, linux-cxl, linux-kernel, linux-pci,
	tglx, wangruikang, alifm, shawn.lin, lihaoxiang, 18255117159,
	xiangzao, vidyas, kaihengf, kobak, newtonl, kristinc

PCI reset recovery may proceed with state restoration and driver
reset_done() callbacks even when a device has not recovered.
Accessing the device in that state can cause additional errors,
including DPC.

This series adds checks before two such access paths: MSI/MSI-X
state restoration and CXL HDM decoder checking.

Patch 1 checks pci_dev_config_accessible() at the start of
__pci_restore_msi_state() and __pci_restore_msix_state(). If
configuration space is inaccessible, warn and return before touching
the device. The DPC containment was observed on the MSI-X table
writes, which are MMIO. MSI is programmed through configuration space
only, but restoring it on an inaccessible device is equally pointless,
so both are covered.

Patch 2 guards CXL decoder accesses after reset. The CXL reset_done()
callback independently accesses HDM decoder MMIO to check whether
decoder state was lost during reset.

version 2's lore link is at
https://lore.kernel.org/all/20260929020405.9724-1-icheng@nvidia.com/

Best regards,
Richard Cheng.

Richard Cheng (2):
  PCI/MSI: Skip MSI/MSI-X restoration when config space is inaccessible
  cxl/pci: Guard decoder accesses after reset

 drivers/cxl/pci.c     | 6 ++++++
 drivers/pci/msi/msi.c | 6 ++++++
 drivers/pci/pci.c     | 2 +-
 drivers/pci/pci.h     | 1 +
 4 files changed, 14 insertions(+), 1 deletion(-)


base-commit: aebb7274476403040d582c61478df8f4a7bf9cd3
-- 
2.43.0


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH v3 1/2] PCI/MSI: Skip MSI/MSI-X restoration when config space is inaccessible
  2026-11-16  6:52 [PATCH v3 0/2] PCI/CXL: Guard device accesses during reset recovery Richard Cheng
@ 2026-11-16  6:52 ` Richard Cheng
  2026-11-16 19:09   ` Bjorn Helgaas
  2026-11-16  6:52 ` [PATCH v3 2/2] cxl/pci: Guard decoder accesses after reset Richard Cheng
  1 sibling, 1 reply; 4+ messages in thread
From: Richard Cheng @ 2026-11-16  6:52 UTC (permalink / raw)
  To: dave, jic23, dave.jiang, alison.schofield, vishal.l.verma, helgaas
  Cc: iweiny, ming.li, icheng, linux-cxl, linux-kernel, linux-pci,
	tglx, wangruikang, alifm, shawn.lin, lihaoxiang, 18255117159,
	xiangzao, vidyas, kaihengf, kobak, newtonl, kristinc

PCI state restoration runs even when a reset fails. If the device's
config space remains inaccessible, MSI-X restoration still writes the
MSI-X table. The table lives in device memory space, and these MMIO
accesses can trigger additional errors, including DPC.

MSI is programmed entirely through config space, so it doesn't issue
such MMIO accesses. Restoring it is still pointless when config space is
inaccessible: reads return all ones and the restore path writes back
values derived from them.

Check whether config space of pci device is accessible or not at the
start of both MSI and MSI-X path, after msi_enabled/msix_enabled test
and before any config access, and skip the restoration if the device is
inaccessible.
Make the helper non-static and declare it in pci.h so the MSI code can
use it, too.

Signed-off-by: Richard Cheng <icheng@nvidia.com>
---
Changelog:

v2 -> v3:
- Cover MSI restoration path as well (Farhan)
- Use pci_dev_config_accessible() instead of open-coding the check, and
  make it non-static (Farhan)
- Move the check before any config space access in the restore
  functions (Farhan)
- The return value of the PCI Command read is no longer checked, since
  the helper only tests for an all-ones value.
- Update the subject and commit message accordingly
---
 drivers/pci/msi/msi.c | 6 ++++++
 drivers/pci/pci.c     | 2 +-
 drivers/pci/pci.h     | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c
index 8a0133a6a286..2865f73f5ead 100644
--- a/drivers/pci/msi/msi.c
+++ b/drivers/pci/msi/msi.c
@@ -524,6 +524,9 @@ void __pci_restore_msi_state(struct pci_dev *dev)
 	if (!dev->msi_enabled)
 		return;
 
+	if (!pci_dev_config_accessible(dev, "restore MSI state"))
+		return;
+
 	entry = irq_get_msi_desc(dev->irq);
 
 	pci_intx_for_msi(dev, 0);
@@ -877,6 +880,9 @@ void __pci_restore_msix_state(struct pci_dev *dev)
 	if (!dev->msix_enabled)
 		return;
 
+	if (!pci_dev_config_accessible(dev, "restore MSI-X state"))
+		return;
+
 	/* route the table */
 	pci_intx_for_msi(dev, 0);
 	pci_msix_clear_and_set_ctrl(dev, 0,
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 7c6f2aba8144..671ffe4da1c8 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -714,7 +714,7 @@ u16 pci_find_dvsec_capability(struct pci_dev *dev, u16 vendor, u16 dvsec)
 }
 EXPORT_SYMBOL_GPL(pci_find_dvsec_capability);
 
-static bool pci_dev_config_accessible(struct pci_dev *dev, char *msg)
+bool pci_dev_config_accessible(struct pci_dev *dev, char *msg)
 {
 	u32 val;
 
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 77efa4c5c960..98dd3dbd5edb 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -240,6 +240,7 @@ enum pci_mmap_api {
 int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vmai,
 		  enum pci_mmap_api mmap_api);
 
+bool pci_dev_config_accessible(struct pci_dev *dev, char *msg);
 bool pci_reset_supported(struct pci_dev *dev);
 void pci_init_reset_methods(struct pci_dev *dev);
 int pci_bridge_secondary_bus_reset(struct pci_dev *dev);
-- 
2.43.0


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH v3 2/2] cxl/pci: Guard decoder accesses after reset
  2026-11-16  6:52 [PATCH v3 0/2] PCI/CXL: Guard device accesses during reset recovery Richard Cheng
  2026-11-16  6:52 ` [PATCH v3 1/2] PCI/MSI: Skip MSI/MSI-X restoration when config space is inaccessible Richard Cheng
@ 2026-11-16  6:52 ` Richard Cheng
  1 sibling, 0 replies; 4+ messages in thread
From: Richard Cheng @ 2026-11-16  6:52 UTC (permalink / raw)
  To: dave, jic23, dave.jiang, alison.schofield, vishal.l.verma, helgaas
  Cc: iweiny, ming.li, icheng, linux-cxl, linux-kernel, linux-pci,
	tglx, wangruikang, alifm, shawn.lin, lihaoxiang, 18255117159,
	xiangzao, vidyas, kaihengf, kobak, newtonl, kristinc

The PCI core calls the driver's reset_done() callback even when a reset
fails and the device has not recovered. cxl_reset_done() then reads the
HDM decoder registers to check whether decoder state was lost. Reading
device MMIO while the device is inaccessible can trigger another error.

Skip the decoder check if the PCI Command read fails, returns all ones,
or Memory Space Enable is clear.

Fixes: 934edcd436dc ("cxl: Add post-reset warning if reset results in loss of previously committed HDM decoders")
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Richard Cheng <icheng@nvidia.com>
---
Changelog:

v2 -> v3:
- Add Fixes tag (Sashiko)
- Read the PCI Command register with pci_read_config_word() instead of
  pci_read_config_dword(), since it's a 16-bit register.
- Reword the commit message and code comment
---
 drivers/cxl/pci.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c
index 8ce58917c32d..dadca2db429d 100644
--- a/drivers/cxl/pci.c
+++ b/drivers/cxl/pci.c
@@ -1106,6 +1106,12 @@ static void cxl_reset_done(struct pci_dev *pdev)
 	struct cxl_dev_state *cxlds = pci_get_drvdata(pdev);
 	struct cxl_memdev *cxlmd = cxlds->cxlmd;
 	struct device *dev = &pdev->dev;
+	u16 command;
+
+	/* The device may still be inaccessible after a failed reset. */
+	if (pci_read_config_word(pdev, PCI_COMMAND, &command) ||
+	    PCI_POSSIBLE_ERROR(command) || !(command & PCI_COMMAND_MEMORY))
+		return;
 
 	/*
 	 * FLR does not expect to touch the HDM decoders and related
-- 
2.43.0


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v3 1/2] PCI/MSI: Skip MSI/MSI-X restoration when config space is inaccessible
  2026-11-16  6:52 ` [PATCH v3 1/2] PCI/MSI: Skip MSI/MSI-X restoration when config space is inaccessible Richard Cheng
@ 2026-11-16 19:09   ` Bjorn Helgaas
  0 siblings, 0 replies; 4+ messages in thread
From: Bjorn Helgaas @ 2026-11-16 19:09 UTC (permalink / raw)
  To: Richard Cheng
  Cc: dave, jic23, dave.jiang, alison.schofield, vishal.l.verma,
	helgaas, iweiny, ming.li, linux-cxl, linux-kernel, linux-pci,
	tglx, wangruikang, alifm, shawn.lin, lihaoxiang, 18255117159,
	xiangzao, vidyas, kaihengf, kobak, newtonl, kristinc

On Mon, Nov 16, 2026 at 02:52:28PM +0800, Richard Cheng wrote:
> PCI state restoration runs even when a reset fails. If the device's
> config space remains inaccessible, MSI-X restoration still writes the
> MSI-X table. The table lives in device memory space, and these MMIO
> accesses can trigger additional errors, including DPC.
> 
> MSI is programmed entirely through config space, so it doesn't issue
> such MMIO accesses. Restoring it is still pointless when config space is
> inaccessible: reads return all ones and the restore path writes back
> values derived from them.
> 
> Check whether config space of pci device is accessible or not at the
> start of both MSI and MSI-X path, after msi_enabled/msix_enabled test
> and before any config access, and skip the restoration if the device is
> inaccessible.

If these are two paragraphs, they need a blank line between.  If a
single paragraph, rewrap to show that.

> Make the helper non-static and declare it in pci.h so the MSI code can
> use it, too.
> 
> Signed-off-by: Richard Cheng <icheng@nvidia.com>
> ---
> Changelog:
> 
> v2 -> v3:
> - Cover MSI restoration path as well (Farhan)
> - Use pci_dev_config_accessible() instead of open-coding the check, and
>   make it non-static (Farhan)
> - Move the check before any config space access in the restore
>   functions (Farhan)
> - The return value of the PCI Command read is no longer checked, since
>   the helper only tests for an all-ones value.
> - Update the subject and commit message accordingly
> ---
>  drivers/pci/msi/msi.c | 6 ++++++
>  drivers/pci/pci.c     | 2 +-
>  drivers/pci/pci.h     | 1 +
>  3 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c
> index 8a0133a6a286..2865f73f5ead 100644
> --- a/drivers/pci/msi/msi.c
> +++ b/drivers/pci/msi/msi.c
> @@ -524,6 +524,9 @@ void __pci_restore_msi_state(struct pci_dev *dev)
>  	if (!dev->msi_enabled)
>  		return;
>  
> +	if (!pci_dev_config_accessible(dev, "restore MSI state"))
> +		return;

Sigh.  I hate the fact that pci_dev_config_accessible() is
proliferating even though it's obviously racy.  Maybe it's the best we
can do, but I just feel like we're digging this hole deeper.

Also, this is called in the pci_restore_state() path, which is full of
other things that also write to config space and will also fail in
this situation.

>  	entry = irq_get_msi_desc(dev->irq);
>  
>  	pci_intx_for_msi(dev, 0);
> @@ -877,6 +880,9 @@ void __pci_restore_msix_state(struct pci_dev *dev)
>  	if (!dev->msix_enabled)
>  		return;
>  
> +	if (!pci_dev_config_accessible(dev, "restore MSI-X state"))
> +		return;
> +
>  	/* route the table */
>  	pci_intx_for_msi(dev, 0);
>  	pci_msix_clear_and_set_ctrl(dev, 0,
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index 7c6f2aba8144..671ffe4da1c8 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -714,7 +714,7 @@ u16 pci_find_dvsec_capability(struct pci_dev *dev, u16 vendor, u16 dvsec)
>  }
>  EXPORT_SYMBOL_GPL(pci_find_dvsec_capability);
>  
> -static bool pci_dev_config_accessible(struct pci_dev *dev, char *msg)
> +bool pci_dev_config_accessible(struct pci_dev *dev, char *msg)
>  {
>  	u32 val;
>  
> diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
> index 77efa4c5c960..98dd3dbd5edb 100644
> --- a/drivers/pci/pci.h
> +++ b/drivers/pci/pci.h
> @@ -240,6 +240,7 @@ enum pci_mmap_api {
>  int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vmai,
>  		  enum pci_mmap_api mmap_api);
>  
> +bool pci_dev_config_accessible(struct pci_dev *dev, char *msg);
>  bool pci_reset_supported(struct pci_dev *dev);
>  void pci_init_reset_methods(struct pci_dev *dev);
>  int pci_bridge_secondary_bus_reset(struct pci_dev *dev);
> -- 
> 2.43.0
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2026-11-16 19:09 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-16  6:52 [PATCH v3 0/2] PCI/CXL: Guard device accesses during reset recovery Richard Cheng
2026-11-16  6:52 ` [PATCH v3 1/2] PCI/MSI: Skip MSI/MSI-X restoration when config space is inaccessible Richard Cheng
2026-11-16 19:09   ` Bjorn Helgaas
2026-11-16  6:52 ` [PATCH v3 2/2] cxl/pci: Guard decoder accesses after reset Richard Cheng

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®