From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 34E45109E52D for ; Wed, 25 Mar 2026 23:13:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Owner; bh=8k/92Vl0S2lizBewoJmB2ydadzdk7wy8S0qCfjQ/afs=; b=5FbWQQxMv41tth 7mmkb+zzhryGd8biPWew+m/g4ik4ik30WMjYrjP4lsWKEMKfomsyU5oPjhRg9rPHY7KsPKgbQTIlq eBUQbSDJpmqlohcaUOtUqEDWyP1WLcofLXm4Xs+EihvriZFUHAotNHVr+fQn6NkBAl9unX87NltwJ a3iLAoleXDqQHbGFVxD+BfAjGzLwkvWYVWo7RfwAYsWaBp6b7/u16Il/gLqgo9d/eCCi1MoPoBg9Q fOZYu3m2xLLdj+lN9ZafpZby746Q7bUOnkdWkM0mGDwGElGRLRkTcixYvbEXL/6Mys0zYrtcPeYI0 kPwMaiE4S7q0Sjwy/etQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1w5XQ5-00000004PRu-19xq; Wed, 25 Mar 2026 23:13:49 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1w5XQ2-00000004PRa-48kK for kexec@lists.infradead.org; Wed, 25 Mar 2026 23:13:48 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 08A2E443C1; Wed, 25 Mar 2026 23:13:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD25EC4CEF7; Wed, 25 Mar 2026 23:13:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774480425; bh=6HOi28c0aIsZQhT8sVNi8T1x2rw2HK7r7jexGLskZ5Q=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=i7j6QyFfV4EDmQQsY0gJwgpsIW7ADhhYgGnyo8je+pZf/Yd1/B6CSVyfqsiGz5whw ffi5t6lwmD73ikTBg4EWjDEh8WdW0XprkdwnHJsz0VO6ETGA7mmy0gNFFDKvQlzplP mVeoq1VreB4lz1/RKR4DFbZJ8FyS3vZ1boOSmPiVM/bPleVXHxEEpInuJg5mP/MyFB F5htIIPnERsMGLVuolqa8UZcItUTh0ekV4PoSoKgsr96fDtqm2RVYvDPbDGGvEu42B tdjEKu5BUx7ahAJDO+rjjuyxNWMVkkWYRXpVaUgrelTRl7IvIJ6sVYrlkuTtugFytx 5zvSEuGK+u7MQ== Date: Wed, 25 Mar 2026 18:13:44 -0500 From: Bjorn Helgaas To: David Matlack Cc: Alex Williamson , Bjorn Helgaas , Adithya Jayachandran , Alexander Graf , Alex Mastro , Andrew Morton , Ankit Agrawal , Arnd Bergmann , Askar Safin , "Borislav Petkov (AMD)" , Chris Li , Dapeng Mi , David Rientjes , Feng Tang , Jacob Pan , Jason Gunthorpe , Jason Gunthorpe , Jonathan Corbet , Josh Hilke , Kees Cook , Kevin Tian , kexec@lists.infradead.org, kvm@vger.kernel.org, Leon Romanovsky , Leon Romanovsky , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, linux-pci@vger.kernel.org, Li RongQing , Lukas Wunner , Marco Elver , =?utf-8?Q?Micha=C5=82?= Winiarski , Mike Rapoport , Parav Pandit , Pasha Tatashin , "Paul E. McKenney" , Pawan Gupta , "Peter Zijlstra (Intel)" , Pranjal Shrivastava , Pratyush Yadav , Raghavendra Rao Ananta , Randy Dunlap , Rodrigo Vivi , Saeed Mahameed , Samiullah Khawaja , Shuah Khan , Vipin Sharma , Vivek Kasireddy , William Tu , Yi Liu , Zhu Yanjun Subject: Re: [PATCH v3 03/24] PCI: Require Live Update preserved devices are in singleton iommu_groups Message-ID: <20260325231344.GA1293155@bhelgaas> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260323235817.1960573-4-dmatlack@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260325_161347_064392_F917DC13 X-CRM114-Status: GOOD ( 26.91 ) X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org On Mon, Mar 23, 2026 at 11:57:55PM +0000, David Matlack wrote: > Require that Live Update preserved devices are in singleton iommu_groups > during preservation (outgoing kernel) and retrieval (incoming kernel). > > PCI devices preserved across Live Update will be allowed to perform > memory transactions throughout the Live Update. Thus IOMMU groups for > preserved devices must remain fixed. Since all current use cases for > Live Update are for PCI devices in singleton iommu_groups, require that > as a starting point. This avoids the complexity of needing to enforce > arbitrary iommu_group topologies while still allowing all current use > cases. > > Suggested-by: Jason Gunthorpe > Signed-off-by: David Matlack > --- > drivers/pci/liveupdate.c | 34 +++++++++++++++++++++++++++++++++- > 1 file changed, 33 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci/liveupdate.c b/drivers/pci/liveupdate.c > index bec7b3500057..a3dbe06650ff 100644 > --- a/drivers/pci/liveupdate.c > +++ b/drivers/pci/liveupdate.c > @@ -75,6 +75,8 @@ > * > * * The device must not be a Physical Function (PF). > * > + * * The device must be the only device in its IOMMU group. > + * > * Preservation Behavior > * ===================== > * > @@ -105,6 +107,7 @@ > > #include > #include > +#include > #include > #include > #include > @@ -222,6 +225,31 @@ static void pci_ser_delete(struct pci_ser *ser, struct pci_dev *dev) > ser->nr_devices--; > } > > +static int count_devices(struct device *dev, void *__nr_devices) > +{ > + (*(int *)__nr_devices)++; > + return 0; > +} > + > +static int pci_liveupdate_validate_iommu_group(struct pci_dev *dev) > +{ > + struct iommu_group *group; > + int nr_devices = 0; > + > + group = iommu_group_get(&dev->dev); > + if (group) { > + iommu_group_for_each_dev(group, &nr_devices, count_devices); > + iommu_group_put(group); > + } > + > + if (nr_devices != 1) { > + pci_warn(dev, "Live Update preserved devices must be in singleton iommu groups!"); > + return -EINVAL; > + } > + > + return 0; I assume the requirement is that there *is* an iommu_group and also that dev is the only member. If so, I think the intent would be a little clearer as: group = iommu_group_get(&dev->dev); if (!group) goto no_group; iommu_group_for_each_dev(group, &nr_devices, count_devices); iommu_group_put(group); if (nr_devices == 1) { return 0; no_group: pci_warn(...); return -EINVAL; > +} > + > int pci_liveupdate_preserve(struct pci_dev *dev) > { > struct pci_dev_ser new = INIT_PCI_DEV_SER(dev); > @@ -232,6 +260,10 @@ int pci_liveupdate_preserve(struct pci_dev *dev) > if (dev->is_virtfn || dev->is_physfn) > return -EINVAL; > > + ret = pci_liveupdate_validate_iommu_group(dev); > + if (ret) > + return ret; > + > guard(mutex)(&pci_flb_outgoing_lock); > > if (dev->liveupdate_outgoing) > @@ -357,7 +389,7 @@ int pci_liveupdate_retrieve(struct pci_dev *dev) > if (!dev->liveupdate_incoming) > return -EINVAL; > > - return 0; > + return pci_liveupdate_validate_iommu_group(dev); > } > EXPORT_SYMBOL_GPL(pci_liveupdate_retrieve); > > -- > 2.53.0.983.g0bb29b3bc5-goog >