All of lore.kernel.org
 help / color / mirror / Atom feed
From: "David Matlack" <dmatlack@google.com>
To: <sashiko-reviews@lists.linux.dev>,
	"David Matlack" <dmatlack@google.com>,
	<kexec@lists.infradead.org>, <linux-mm@kvack.org>,
	<linux-pci@vger.kernel.org>
Cc: "Adithya Jayachandran" <ajayachandra@nvidia.com>,
	"Alexander Graf" <graf@amazon.com>,
	"Alex Williamson" <alex@shazbot.org>,
	"Alex Williamson" <alex.williamson@nvidia.com>,
	"Bjorn Helgaas" <bhelgaas@google.com>,
	"Chris Down" <chris@chrisdown.name>,
	"Chris Li" <chrisl@kernel.org>,
	"David Rientjes" <rientjes@google.com>,
	"Jacob Pan" <jacob.pan@linux.microsoft.com>,
	"Jason Gunthorpe" <jgg@nvidia.com>,
	"Jonathan Corbet" <corbet@lwn.net>,
	"Josh Hilke" <jrhilke@google.com>,
	"Leon Romanovsky" <leonro@nvidia.com>,
	"Lukas Wunner" <lukas@wunner.de>,
	"Mike Rapoport" <rppt@kernel.org>,
	"Parav Pandit" <parav@nvidia.com>,
	"Pasha Tatashin" <pasha.tatashin@soleen.com>,
	"Pranjal Shrivastava" <praan@google.com>,
	"Pratyush Yadav" <pratyush@kernel.org>,
	"Randy Dunlap" <rdunlap@infradead.org>,
	"Saeed Mahameed" <saeedm@nvidia.com>,
	"Samiullah Khawaja" <skhawaja@google.com>,
	"Shuah Khan" <skhan@linuxfoundation.org>,
	"Vipin Sharma" <vipinsh@google.com>,
	"William Tu" <witu@nvidia.com>, "Yi Liu" <yi.l.liu@intel.com>
Subject: Re: [PATCH v11 10/13] PCI: liveupdate: Adopt ARI Forwarding Enable on preserved bridges
Date: Fri, 20 Nov 2026 11:25:01 -0800	[thread overview]
Message-ID: <DN0A8VWPLTYF.3Q0MIEDWLJYN4@google.com> (raw)
In-Reply-To: <sashiko-outbox-224145@kernel.org>

On Thu Nov 19, 2026 at 2:38 PM PST, sashiko-bot wrote:
> Thank you for your contribution! Sashiko AI review found 1 potential
> issue to consider:
> - [Medium] PCI: liveupdate: stale ARI state in pci_configure_ari() with
>   pci=noari
> --
>
> commit ee2b5e1cebde3231a1c9acaaf68c272dbf3c6e8e
> Author: David Matlack <dmatlack@google.com>
>
> PCI: liveupdate: Adopt ARI Forwarding Enable on preserved bridges
>
> This commit adopts the ARI Forwarding Enable bit from hardware on
> incoming-preserved bridges during a Live Update, even when pci=noari is
> passed on the kernel command line.
>
>> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
>> index ebc565b4780a1..b5b578355a1b6 100644
>> --- a/drivers/pci/pci.c
>> +++ b/drivers/pci/pci.c
>> @@ -3748,7 +3748,7 @@ void pci_configure_ari(struct pci_dev *dev)
>>  	u32 cap;
>>  	struct pci_dev *bridge;
>>  
>> -	if (pcie_ari_disabled || !pci_is_pcie(dev) || dev->devfn)
>> +	if (!pci_is_pcie(dev) || dev->devfn)
>>  		return;
>>  
>>  	bridge = dev->bus->self;
>> @@ -3759,6 +3759,12 @@ void pci_configure_ari(struct pci_dev *dev)
>>  	if (!(cap & PCI_EXP_DEVCAP2_ARI))
>>  		return;
>>  
>> +	if (!pci_liveupdate_adopt_ari(bridge))
>> +		return;
>> +
>> +	if (pcie_ari_disabled)
>> +		return;
>> +
>>  	if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ARI)) {
>>  		pcie_capability_set_word(bridge, PCI_EXP_DEVCTL2,
>>  					 PCI_EXP_DEVCTL2_ARI);
>
> [Severity: Medium]
> Does returning early on pcie_ari_disabled leave PCI_EXP_DEVCTL2_ARI and
> bridge->ari_enabled set to 1 if a new device is hot-plugged after the
> preserved devices below the bridge have finished Live Update?
>
> When booting with pci=noari, pci_liveupdate_adopt_ari() sets
> bridge->ari_enabled = 1 while bridge->liveupdate.incoming is set.  Once
> the preserved devices finish Live Update and bridge->liveupdate.incoming
> is cleared, hot-plugging or rescanning a non-ARI multi-function device
> below the bridge causes pci_liveupdate_adopt_ari() to return -EINVAL and
> pci_configure_ari() to return at pcie_ari_disabled without reaching the
> else branch that clears PCI_EXP_DEVCTL2_ARI and bridge->ari_enabled.
> Because bridge->ari_enabled stays 1, next_fn() calls next_ari_fn(), which
> returns -ENODEV and skips enumerating functions 1..7 on the new device.
>
> Checking !pcie_ari_disabled alongside pci_find_ext_capability(dev,
> PCI_EXT_CAP_ID_ARI) instead of returning early would allow the else branch
> to clear PCI_EXP_DEVCTL2_ARI and bridge->ari_enabled.

Yes, but only in a very narrow case: the next kernel is booted with
pci=noari, the previous kernel enabled ARI Forwarding on a bridge above
a preserved device, the preserved devices below that bridge finish, and
then a _different_ multi-function device without ARI is hot-plugged below
the same bridge. The only impact is that functions 1-7 of the
hot-plugged device are not enumerated. There is no corruption or crash.

I don't think this is worth changing more PCI core code in
pci_configure_ari() for in this series. It can be addressed in a future
patch if someone really wants to do that.

The comment in pci_liveupdate_adopt_ari() can be improved though, since
it claims ARI Forwarding Enable is always recomputed after the preserved
devices finish. I will update it in v12 to document the pci=noari
behavior:

diff --git a/drivers/pci/liveupdate.c b/drivers/pci/liveupdate.c
index 493576119a76..7582b87df3ad 100644
--- a/drivers/pci/liveupdate.c
+++ b/drivers/pci/liveupdate.c
@@ -937,9 +937,14 @@ int pci_liveupdate_adopt_ari(struct pci_dev *dev)
 
 	/*
 	 * Unlike ACS, only adopt ARI while the bridge is incoming-preserved.
-	 * Once all devices below the bridge have finished, recomputing ARI
-	 * Forwarding Enable yields the same result for the same device, and
-	 * must be allowed to change if a different device is hot-plugged.
+	 * Once all devices below the bridge have finished, pci_configure_ari()
+	 * configures ARI Forwarding Enable as usual the next time a device is
+	 * added below the bridge, e.g. if a different device is hot-plugged.
+	 *
+	 * The exception is pci=noari, where pci_configure_ari() does not touch
+	 * the bridge, so the adopted ARI Forwarding Enable persists after the
+	 * preserved devices finish, even if a device without ARI is later
+	 * hot-plugged below the bridge.
 	 */
 	if (!dev->liveupdate.incoming)
 		return -EINVAL;

  reply	other threads:[~2026-11-20 19:25 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-18 22:36 [PATCH v11 00/13] PCI: liveupdate: PCI core support for Live Update David Matlack
2026-11-18 22:36 ` [PATCH v11 01/13] PCI: liveupdate: Set up FLB handler for the PCI core David Matlack
2026-11-19 22:38   ` sashiko-bot
2026-11-18 22:36 ` [PATCH v11 02/13] PCI: liveupdate: Track outgoing preserved PCI devices David Matlack
2026-11-19 22:38   ` sashiko-bot
2026-11-18 22:36 ` [PATCH v11 03/13] PCI: liveupdate: Track incoming " David Matlack
2026-11-19 22:38   ` sashiko-bot
2026-11-18 22:36 ` [PATCH v11 04/13] PCI: liveupdate: Document driver binding responsibilities David Matlack
2026-11-19 22:38   ` sashiko-bot
2026-11-18 22:36 ` [PATCH v11 05/13] PCI: liveupdate: Auto-preserve upstream bridges across Live Update David Matlack
2026-11-19 22:38   ` sashiko-bot
2026-11-18 22:36 ` [PATCH v11 06/13] PCI: liveupdate: Preserve bus numbers during " David Matlack
2026-11-19 22:38   ` sashiko-bot
2026-11-18 22:36 ` [PATCH v11 07/13] PCI: Refactor matching logic for pci_dev_acs_ops David Matlack
2026-11-19 22:38   ` sashiko-bot
2026-11-18 22:36 ` [PATCH v11 08/13] PCI: Save and restore the ACS Control register and Egress Control Vector David Matlack
2026-11-19 22:38   ` sashiko-bot
2026-11-20 14:44   ` Pranjal Shrivastava
2026-11-18 22:37 ` [PATCH v11 09/13] PCI: liveupdate: Adopt ACS controls in incoming preserved devices David Matlack
2026-11-19 22:38   ` sashiko-bot
2026-11-20  0:10   ` Alex Williamson
2026-11-20 15:17   ` Pranjal Shrivastava
2026-11-20 19:29     ` David Matlack
2026-11-18 22:37 ` [PATCH v11 10/13] PCI: liveupdate: Adopt ARI Forwarding Enable on preserved bridges David Matlack
2026-11-19 22:38   ` sashiko-bot
2026-11-20 19:25     ` David Matlack [this message]
2026-11-18 22:37 ` [PATCH v11 11/13] PCI: liveupdate: Freeze preservation status during shutdown David Matlack
2026-11-19 22:38   ` sashiko-bot
2026-11-20 19:11     ` David Matlack
2026-11-18 22:37 ` [PATCH v11 12/13] PCI: liveupdate: Do not disable bus mastering on preserved devices during kexec David Matlack
2026-11-19 22:38   ` sashiko-bot
2026-11-18 22:37 ` [PATCH v11 13/13] Documentation: PCI: Add documentation for Live Update David Matlack
2026-11-19 22:38   ` sashiko-bot
2026-11-19 11:17 ` [PATCH v11 00/13] PCI: liveupdate: PCI core support " Mike Rapoport

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DN0A8VWPLTYF.3Q0MIEDWLJYN4@google.com \
    --to=dmatlack@google.com \
    --cc=ajayachandra@nvidia.com \
    --cc=alex.williamson@nvidia.com \
    --cc=alex@shazbot.org \
    --cc=bhelgaas@google.com \
    --cc=chris@chrisdown.name \
    --cc=chrisl@kernel.org \
    --cc=corbet@lwn.net \
    --cc=graf@amazon.com \
    --cc=jacob.pan@linux.microsoft.com \
    --cc=jgg@nvidia.com \
    --cc=jrhilke@google.com \
    --cc=kexec@lists.infradead.org \
    --cc=leonro@nvidia.com \
    --cc=linux-mm@kvack.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lukas@wunner.de \
    --cc=parav@nvidia.com \
    --cc=pasha.tatashin@soleen.com \
    --cc=praan@google.com \
    --cc=pratyush@kernel.org \
    --cc=rdunlap@infradead.org \
    --cc=rientjes@google.com \
    --cc=rppt@kernel.org \
    --cc=saeedm@nvidia.com \
    --cc=sashiko-reviews@lists.linux.dev \
    --cc=skhan@linuxfoundation.org \
    --cc=skhawaja@google.com \
    --cc=vipinsh@google.com \
    --cc=witu@nvidia.com \
    --cc=yi.l.liu@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.