From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7031B383C97 for ; Tue, 16 Jun 2026 20:09:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781640596; cv=none; b=n/cxLHOaMr01jvpSJjueLmVCeFt4efSO+04isaH+SB4kLOr/uKwMrftgI4uY9FBbzo1Nz5Pb4xa0vgWUlbDYy7VYXEZC09twh9SqwY0MZwPGsDQPQ85jeVdnKo6qhYcjRatewKcK4FOIb09qBApcdqh0D6yN/Y7d613G9dKNrro= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781640596; c=relaxed/simple; bh=Pi/EN82vqMuVLAd9KenSHzDk6OqMVCIPbDAtZFjy9Rg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=b27Dfrn61FzVMNWRqrUSXuIW7zZlSCNA8F+RTXnT6NOcLkLN4y78FacAzIKquWQhqlj300CmjIUKQqbAJ61mOsauiX4APgexSd6X1nTZRCC6BsQ6pjUHf1DuuELMUTXE7M67IZ1ZtkICZ+PHIHd9BB/Ia6M5DDQC3Jo/ryJSjug= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Eg9TNlFu; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Eg9TNlFu" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2c69fa0b1f8so16795ad.0 for ; Tue, 16 Jun 2026 13:09:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781640595; x=1782245395; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=9ZboXXhSPW6+dD4pxDQDq+/2Nr1RExG44843PmiSexM=; b=Eg9TNlFuOXW2dihvx6h8jhwMUxeKZqJDcY2yXMXCH+FmR8UPp+9aMj4syrBGDvzc21 oVbI5c8hHEh/wGhWUcdtfs+sJOgrNUMvH35XMZ8OiqFEk4vQxrnbVUJHobMqO/nKcobF tilNbylePqD0kJY83PHKdsw38b+6CODmaIyjnMPiXuB/MD4gDNOdL6oSaoAXPLa80UpZ eTqkSwfaSkdmS5lJscvW0IpIJ2QuJA4SxUC6Lol5m6zRd7LJoI0kWyu32UEsQVkYhzV7 qF2gQPUYU5p0AMFO/ryMUg7Y8SFQlizACe+cGAB9FcENwMXmVazW4/1aoSMKJPyY/5Fw R9Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781640595; x=1782245395; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9ZboXXhSPW6+dD4pxDQDq+/2Nr1RExG44843PmiSexM=; b=RtbkTiDC1w8tEzx2e+ZprebLAAaMP4baZlK4SI479Sx6JHN/c32km6/AkP3/yiTdnV lLgsyY67N0RvJCnQ9Rb/L58bk5rvkbjZBZZqgD6MTPp3rznuhxtjauZfNVf16hm8P/8I pkcbMwhXeuo8cJJ/TEywQQLkyAD71iVlu3y3ZdyempNBrxepRjK8Wyfao+3ud/kyiFnR 0yDVzPW5/MhjBnNfehsSYaU0Uruv4s/siE0KL5ofzlCiiD8E22Je54NwMNI9X85YwESu m0oAcZdhmYfcMFSzBY8SIQZxBhfXiyDho0XpnSmJqO9VSqXVKb/lFsfVKvuqGWAOIpWZ AFjw== X-Forwarded-Encrypted: i=1; AFNElJ/8QKVV1Dh6VcMAfHvsd84M7VeldYt3Qw/779U/r0za6ihcnZNGvuhZDPODu2E41rzx9+THQsbG7a8=@vger.kernel.org X-Gm-Message-State: AOJu0YzAvOPBa5GQITUfmkYiqS0oGAKUEQxiGhC5oyRKlWYkq6u/WApA Cnaxu22qYpJYFeArUxe14U13nAWLlH7Y9247y7totFcZUu+Mz/5yfA7JQybt8oDD2Q== X-Gm-Gg: AfdE7cluPKKh1KcVaUSUHY4aeYjPyMOypZOW2H4youcgZXVz9AknSlOvHyyVdgl0BLa D1xpHXNyJ+1Z6dZlrCi9550ig9rkVuaJJHPl3o9o7EZKnj04O3UsWMsUQMlIaSga8pEChwkSDEe YOsRqhaumJF6/gDjy0rdZ2d9/CgeAQtbd1m7TxxFku0qzbvcoXE/dqWdn3xMwibU1kAEfwvUN3W +t99czlYKKlj50BnegvwKpuyuxXu4yN1BtWnL3hE3zLK0mTjhTdv4KbkwepOZrGDRQPyjIq7APv vaVFoYBgHK4T64G/NpRw1KR8KttQml742cojTkNXwFLkCQdvTVrRm2EkGfjm3+7Xnavon7KmMPw svvwxFe40fR7gH8oZJLFbbPTZubalgdZ9PmijVuZtW7HuEBfQPfKRpK4UQagngUq2cJW1RcYl7Q 8SFF4uOcDsm9sOGOVodiySKYlQGGQCUzziHK7Sq2jadffcHOZx4mY237NcinlYAGtt1u9ygamhu A3E3lrMdQ2kJ98uEXc= X-Received: by 2002:a17:903:2307:b0:2c1:ee6e:be1c with SMTP id d9443c01a7336-2c6bbb0fd15mr461975ad.26.1781640594220; Tue, 16 Jun 2026 13:09:54 -0700 (PDT) Received: from google.com (25.75.145.34.bc.googleusercontent.com. [34.145.75.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8434ac9c016sm13938380b3a.8.2026.06.16.13.09.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2026 13:09:53 -0700 (PDT) Date: Tue, 16 Jun 2026 20:09:49 +0000 From: Samiullah Khawaja To: David Matlack Cc: kexec@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-pci@vger.kernel.org, Adithya Jayachandran , Alexander Graf , Alex Williamson , Bjorn Helgaas , Chris Li , David Rientjes , Jacob Pan , Jason Gunthorpe , Jonathan Corbet , Josh Hilke , Leon Romanovsky , Lukas Wunner , Mike Rapoport , Parav Pandit , Pasha Tatashin , Pranjal Shrivastava , Pratyush Yadav , Saeed Mahameed , Shuah Khan , Vipin Sharma , William Tu , Yi Liu Subject: Re: [PATCH v6 03/12] PCI: liveupdate: Track incoming preserved PCI devices Message-ID: References: <20260522202410.3104264-1-dmatlack@google.com> <20260522202410.3104264-4-dmatlack@google.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=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20260522202410.3104264-4-dmatlack@google.com> On Fri, May 22, 2026 at 08:24:01PM +0000, David Matlack wrote: >During PCI enumeration, the previous kernel might have passed state about >devices that were preserved across kexec. The PCI core needs to fetch >this state to identify which devices are "incoming" and require special >handling. > >Add pci_liveupdate_setup_device() which is called during device setup >to fetch the serialized state (struct pci_ser) from the Live Update >Orchestrator. The first time this happens, pci_flb_retrieve() will run >and convert the array of pci_dev_ser structs into an xarray so that it >can be looked up efficiently. > >If a device is found in the xarray, the PCI core stores a pointer to its >state in dev->liveupdate_incoming and holds a reference to the incoming >FLB until pci_liveupdate_finish() is called by the driver. > >This ensures proper lifecycle management for incoming preserved devices >and allows the PCI core and drivers to apply specific Live Update >logic to them in subsequent commits. > >Drivers can check if a device is an incoming preserved device (e.g. >during probe) by calling pci_liveupdate_is_incoming(). > >CONFIG_64BIT is now required to enable CONFIG_PCI_LIVEUPDATE so that the >domain and bdf can be guaranteed to fit in an unsigned long and be used >as the xarray key. > >Signed-off-by: David Matlack >--- > MAINTAINERS | 1 + > drivers/pci/Kconfig | 2 +- > drivers/pci/liveupdate.c | 230 ++++++++++++++++++++++++++++++++- > drivers/pci/liveupdate.h | 5 + > drivers/pci/probe.c | 3 + > include/linux/pci_liveupdate.h | 13 ++ > 6 files changed, 251 insertions(+), 3 deletions(-) > [snip] > > static int pci_flb_retrieve(struct liveupdate_flb_op_args *args) > { >- args->obj = phys_to_virt(args->data); >+ struct pci_ser *ser = phys_to_virt(args->data); >+ struct pci_flb_incoming *incoming; >+ int ret = -ENOMEM; >+ u32 i; >+ >+ incoming = kmalloc_obj(*incoming); >+ if (!incoming) >+ goto err_restore_free; >+ >+ incoming->ser = ser; >+ xa_init(&incoming->xa); >+ >+ for (i = 0; i < incoming->ser->max_nr_devices; i++) { >+ struct pci_dev_ser *dev_ser = &incoming->ser->devices[i]; >+ unsigned long key; >+ >+ if (!dev_ser->refcount) >+ continue; >+ >+ key = pci_ser_xa_key(dev_ser->domain, dev_ser->bdf); >+ ret = xa_insert(&incoming->xa, key, dev_ser, GFP_KERNEL); >+ if (ret) >+ goto err_xa_destroy; >+ } >+ >+ args->obj = incoming; > return 0; >+ >+err_xa_destroy: >+ xa_destroy(&incoming->xa); >+ kfree(incoming); >+err_restore_free: >+ kho_restore_free(ser); >+ return ret; Hmm.. This is interesting, so the KHO state is freed and it cannot be reused. I see you already pointed out that we are putting an LUO policy to say that the retry is not allowed. But what should be the behaviour of liveupdate in this regard? Let the system boot in a normal way? This might break other subsystems as they might depend on PCIe restoring state properly. Also I think some of the PCIe state, like device-id, BAR addresses, ACLs etc, might be used as source of truth by other components. For example, lets say FLB retrieve() of PCIe fails, but succeeds for VFIO/IOMMU, now VFIO/IOMMU are restoring state of a device that is not restored/preserved? Should this be considered fatal? > } > > static void pci_flb_finish(struct liveupdate_flb_op_args *args) > { >- kho_restore_free(args->obj); >+ struct pci_flb_incoming *incoming = args->obj; >+ >+ xa_destroy(&incoming->xa); >+ kho_restore_free(incoming->ser); >+ kfree(incoming); > } > > static struct liveupdate_flb_ops pci_liveupdate_flb_ops = { >@@ -270,6 +335,91 @@ void pci_liveupdate_unpreserve(struct pci_dev *dev) > } > EXPORT_SYMBOL_GPL(pci_liveupdate_unpreserve); > >+static struct pci_flb_incoming *pci_liveupdate_flb_get_incoming(void) >+{ >+ struct pci_flb_incoming *incoming = NULL; >+ int ret; >+ >+ ret = liveupdate_flb_get_incoming(&pci_liveupdate_flb, (void **)&incoming); >+ >+ /* Live Update is not enabled. */ >+ if (ret == -EOPNOTSUPP) >+ return NULL; >+ >+ /* Live Update is enabled, but there is no incoming FLB data. */ >+ if (ret == -ENODATA) >+ return NULL; >+ >+ /* >+ * Live Update is enabled and there is incoming FLB data, but none of it >+ * matches pci_liveupdate_flb.compatible. >+ * >+ * This could mean that no PCI FLB data was passed by the previous >+ * kernel, but it could also mean the previous kernel used a different >+ * compatibility string (i.e. a different ABI). >+ */ >+ if (ret == -ENOENT) { >+ pr_info_once("No incoming FLB matched %s\n", pci_liveupdate_flb.compatible); >+ return NULL; >+ } >+ >+ /* >+ * There is incoming FLB data that matches pci_liveupdate_flb.compatible >+ * but it cannot be retrieved. >+ */ >+ if (ret) { >+ WARN_ONCE(ret, "Failed to retrieve incoming FLB data\n"); I think this should probably be considered fatal as mentioned above or the caller of this function should get an error so it can fail. I think retrievel of preserved state should generally not fail unless there is memory corruption or ABI is incompatible. >+ return NULL; >+ } >+ >+ return incoming; >+} >+ [snip] >+ >+static inline bool pci_liveupdate_is_incoming(struct pci_dev *dev) >+{ >+ return false; >+} > #endif > > #endif /* LINUX_PCI_LIVEUPDATE_H */ >-- >2.54.0.746.g67dd491aae-goog > Sami