drivers/xen/xenbus/xenbus_client.c | 2 ++ drivers/xen/xenbus/xenbus_probe.c | 25 +++++++++++++++++++++++++ include/xen/xenbus.h | 1 + 3 files changed, 28 insertions(+)
When the backend domain crashes, coordinated device cleanup is not
possible (as it involves waiting for the backend state change). In that
case, toolstack forcefully removes frontend xenstore entries.
xenbus_dev_changed() handles this case, and triggers device cleanup.
It's possible that toolstack manages to connect new device in that
place, before xenbus_dev_changed() notices the old one is missing. If
that happens, new one won't be probed and will forever remain in
XenbusStateInitialising.
Fix this by checking backend-id and if it changes, consider it
unplug+plug operation. It's important that cleanup on such unplug
doesn't modify xenstore entries (especially the "state" key) as it
belong to the new device to be probed - changing it would derail
establishing connection to the new backend (most likely, closing the
device before it was even connected). Handle this case by setting new
xenbus_device->vanished flag to true, and check it before changing state
entry.
And even if xenbus_dev_changed() correctly detects the device was
forcefully removed, the cleanup handling is still racy. Since this whole
handling doesn't happend in a single xenstore transaction, it's possible
that toolstack might put a new device there already. Avoid re-creating
the state key (which in the case of loosing the race would actually
close newly attached device).
The problem does not apply to frontend domain crash, as this case
involves coordinated cleanup.
Problem originally reported at
https://lore.kernel.org/xen-devel/aOZvivyZ9YhVWDLN@mail-itl/T/#t,
including reproduction steps.
Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
---
I considered re-using one of existing fields instead of a new
xenbus_device->vanished, but I wasn't sure if that would work better.
Setting xenbus_device->nodename to NULL would prevent few other places
using it (including some log messages). Setting xenbus_device->otherend
might have less unintentional impact, but logically it doesn't feel
correct.
With this patch applied, I cannot reproduce the issue anymore - neither
with the simplified reproducer script, nor with the full test suite.
---
drivers/xen/xenbus/xenbus_client.c | 2 ++
drivers/xen/xenbus/xenbus_probe.c | 25 +++++++++++++++++++++++++
include/xen/xenbus.h | 1 +
3 files changed, 28 insertions(+)
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
index e73ec225d4a61..ce2f49d9aa4ad 100644
--- a/drivers/xen/xenbus/xenbus_client.c
+++ b/drivers/xen/xenbus/xenbus_client.c
@@ -275,6 +275,8 @@ __xenbus_switch_state(struct xenbus_device *dev,
*/
int xenbus_switch_state(struct xenbus_device *dev, enum xenbus_state state)
{
+ if (dev->vanished)
+ return 0;
return __xenbus_switch_state(dev, state, 0);
}
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index 86fe6e7790566..3c3e56b544976 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -444,6 +444,9 @@ static void xenbus_cleanup_devices(const char *path, struct bus_type *bus)
info.dev = NULL;
bus_for_each_dev(bus, NULL, &info, cleanup_dev);
if (info.dev) {
+ dev_warn(&info.dev->dev,
+ "device forcefully removed from xenstore\n");
+ info.dev->vanished = true;
device_unregister(&info.dev->dev);
put_device(&info.dev->dev);
}
@@ -659,6 +662,28 @@ void xenbus_dev_changed(const char *node, struct xen_bus_type *bus)
return;
dev = xenbus_device_find(root, &bus->bus);
+ /* Backend domain crash results in not coordinated frontend removal,
+ * without going through XenbusStateClosing. Check if the device
+ * wasn't replaced to point at another backend in the meantime.
+ */
+ if (dev && !strncmp(node, "device/", sizeof("device/")-1)) {
+ int backend_id;
+ int err = xenbus_gather(XBT_NIL, root,
+ "backend-id", "%i", &backend_id,
+ NULL);
+ if (!err && backend_id != dev->otherend_id) {
+ /* It isn't the same device, assume the old one
+ * vanished and new one needs to be probed.
+ */
+ dev_warn(&dev->dev,
+ "backend-id mismatch (%d != %d), reconnecting\n",
+ backend_id, dev->otherend_id);
+ dev->vanished = true;
+ device_unregister(&dev->dev);
+ put_device(&dev->dev);
+ dev = NULL;
+ }
+ }
if (!dev)
xenbus_probe_node(bus, type, root);
else
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h
index 7dab04cf4a36c..43a5335f1d5a3 100644
--- a/include/xen/xenbus.h
+++ b/include/xen/xenbus.h
@@ -87,6 +87,7 @@ struct xenbus_device {
struct completion down;
struct work_struct work;
struct semaphore reclaim_sem;
+ bool vanished;
/* Event channel based statistics and settings. */
atomic_t event_channels;
--
2.51.0
On 02.11.25 04:20, Marek Marczykowski-Górecki wrote: > When the backend domain crashes, coordinated device cleanup is not > possible (as it involves waiting for the backend state change). In that > case, toolstack forcefully removes frontend xenstore entries. > xenbus_dev_changed() handles this case, and triggers device cleanup. > It's possible that toolstack manages to connect new device in that > place, before xenbus_dev_changed() notices the old one is missing. If > that happens, new one won't be probed and will forever remain in > XenbusStateInitialising. > > Fix this by checking backend-id and if it changes, consider it > unplug+plug operation. It's important that cleanup on such unplug > doesn't modify xenstore entries (especially the "state" key) as it > belong to the new device to be probed - changing it would derail > establishing connection to the new backend (most likely, closing the > device before it was even connected). Handle this case by setting new > xenbus_device->vanished flag to true, and check it before changing state > entry. > > And even if xenbus_dev_changed() correctly detects the device was > forcefully removed, the cleanup handling is still racy. Since this whole > handling doesn't happend in a single xenstore transaction, it's possible > that toolstack might put a new device there already. Avoid re-creating > the state key (which in the case of loosing the race would actually > close newly attached device). > > The problem does not apply to frontend domain crash, as this case > involves coordinated cleanup. > > Problem originally reported at > https://lore.kernel.org/xen-devel/aOZvivyZ9YhVWDLN@mail-itl/T/#t, > including reproduction steps. > > Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> Sorry I didn't get earlier to this. My main problem with this patch is that it is basically just papering over a more general problem. You are just making the problem much more improbable, but not impossible to occur again. In case the new driver domain has the same domid as the old one you can still have the same race. The clean way to handle that would be to add a unique Id in Xenstore to each device on the backend side, which can be tested on the frontend side to match. In case it doesn't match, an old device with the same kind and devid can be cleaned up. The unique Id would obviously need to be set by the Xen tools inside the transaction writing the initial backend Xenstore nodes, as doing that from the backend would add another potential ambiguity by the driver domain choosing the same unique id as the previous one did. The question is whether something like your patch should be used as a fallback in case there is no unique Id on the backend side of the device due to a too old Xen version. Juergen
On 17.11.25 12:06, Jürgen Groß wrote: > On 02.11.25 04:20, Marek Marczykowski-Górecki wrote: >> When the backend domain crashes, coordinated device cleanup is not >> possible (as it involves waiting for the backend state change). In that >> case, toolstack forcefully removes frontend xenstore entries. >> xenbus_dev_changed() handles this case, and triggers device cleanup. >> It's possible that toolstack manages to connect new device in that >> place, before xenbus_dev_changed() notices the old one is missing. If >> that happens, new one won't be probed and will forever remain in >> XenbusStateInitialising. >> >> Fix this by checking backend-id and if it changes, consider it >> unplug+plug operation. It's important that cleanup on such unplug >> doesn't modify xenstore entries (especially the "state" key) as it >> belong to the new device to be probed - changing it would derail >> establishing connection to the new backend (most likely, closing the >> device before it was even connected). Handle this case by setting new >> xenbus_device->vanished flag to true, and check it before changing state >> entry. >> >> And even if xenbus_dev_changed() correctly detects the device was >> forcefully removed, the cleanup handling is still racy. Since this whole >> handling doesn't happend in a single xenstore transaction, it's possible >> that toolstack might put a new device there already. Avoid re-creating >> the state key (which in the case of loosing the race would actually >> close newly attached device). >> >> The problem does not apply to frontend domain crash, as this case >> involves coordinated cleanup. >> >> Problem originally reported at >> https://lore.kernel.org/xen-devel/aOZvivyZ9YhVWDLN@mail-itl/T/#t, >> including reproduction steps. >> >> Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> > > Sorry I didn't get earlier to this. > > My main problem with this patch is that it is basically just papering over > a more general problem. > > You are just making the problem much more improbable, but not impossible to > occur again. In case the new driver domain has the same domid as the old one > you can still have the same race. > > The clean way to handle that would be to add a unique Id in Xenstore to each > device on the backend side, which can be tested on the frontend side to > match. In case it doesn't match, an old device with the same kind and devid > can be cleaned up. > > The unique Id would obviously need to be set by the Xen tools inside the > transaction writing the initial backend Xenstore nodes, as doing that from > the backend would add another potential ambiguity by the driver domain > choosing the same unique id as the previous one did. > > The question is whether something like your patch should be used as a > fallback in case there is no unique Id on the backend side of the device > due to a too old Xen version. I think I have found a solution which is much more simple, as it doesn't need any change of the protocol or any addition of new identifiers. When creating a new PV device, Xen tools will always write all generic frontend- and backend-nodes. This includes the frontend state, which is initialized as XenbusStateInitialising. The Linux kernel's xenbus driver is already storing the last known state of a xenbus device in struct xenbus_device. When changing the state, the xenbus driver is even reading the state from Xenstore (even if only for making sure the path is still existing). So all what is needed is to check, whether the read current state is matching the locally saved state. If it is not matching AND the read state is XenbusStateInitialising, you can be sure that the backend has been replaced. Handling this will need to check the return value of xenbus_switch_state() in all related drivers, but this is just a more or less mechanical change. I'll prepare a patch series for that. Juergen
On 26.01.26 08:08, Jürgen Groß wrote: > On 17.11.25 12:06, Jürgen Groß wrote: >> On 02.11.25 04:20, Marek Marczykowski-Górecki wrote: >>> When the backend domain crashes, coordinated device cleanup is not >>> possible (as it involves waiting for the backend state change). In that >>> case, toolstack forcefully removes frontend xenstore entries. >>> xenbus_dev_changed() handles this case, and triggers device cleanup. >>> It's possible that toolstack manages to connect new device in that >>> place, before xenbus_dev_changed() notices the old one is missing. If >>> that happens, new one won't be probed and will forever remain in >>> XenbusStateInitialising. >>> >>> Fix this by checking backend-id and if it changes, consider it >>> unplug+plug operation. It's important that cleanup on such unplug >>> doesn't modify xenstore entries (especially the "state" key) as it >>> belong to the new device to be probed - changing it would derail >>> establishing connection to the new backend (most likely, closing the >>> device before it was even connected). Handle this case by setting new >>> xenbus_device->vanished flag to true, and check it before changing state >>> entry. >>> >>> And even if xenbus_dev_changed() correctly detects the device was >>> forcefully removed, the cleanup handling is still racy. Since this whole >>> handling doesn't happend in a single xenstore transaction, it's possible >>> that toolstack might put a new device there already. Avoid re-creating >>> the state key (which in the case of loosing the race would actually >>> close newly attached device). >>> >>> The problem does not apply to frontend domain crash, as this case >>> involves coordinated cleanup. >>> >>> Problem originally reported at >>> https://lore.kernel.org/xen-devel/aOZvivyZ9YhVWDLN@mail-itl/T/#t, >>> including reproduction steps. >>> >>> Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> >> >> Sorry I didn't get earlier to this. >> >> My main problem with this patch is that it is basically just papering over >> a more general problem. >> >> You are just making the problem much more improbable, but not impossible to >> occur again. In case the new driver domain has the same domid as the old one >> you can still have the same race. >> >> The clean way to handle that would be to add a unique Id in Xenstore to each >> device on the backend side, which can be tested on the frontend side to >> match. In case it doesn't match, an old device with the same kind and devid >> can be cleaned up. >> >> The unique Id would obviously need to be set by the Xen tools inside the >> transaction writing the initial backend Xenstore nodes, as doing that from >> the backend would add another potential ambiguity by the driver domain >> choosing the same unique id as the previous one did. >> >> The question is whether something like your patch should be used as a >> fallback in case there is no unique Id on the backend side of the device >> due to a too old Xen version. > > I think I have found a solution which is much more simple, as it doesn't > need any change of the protocol or any addition of new identifiers. > > When creating a new PV device, Xen tools will always write all generic > frontend- and backend-nodes. This includes the frontend state, which is > initialized as XenbusStateInitialising. > > The Linux kernel's xenbus driver is already storing the last known state > of a xenbus device in struct xenbus_device. When changing the state, the > xenbus driver is even reading the state from Xenstore (even if only for > making sure the path is still existing). So all what is needed is to check, > whether the read current state is matching the locally saved state. If it > is not matching AND the read state is XenbusStateInitialising, you can be > sure that the backend has been replaced. > > Handling this will need to check the return value of xenbus_switch_state() > in all related drivers, but this is just a more or less mechanical change. > > I'll prepare a patch series for that. In the end the result is more like your patch, avoiding the need to modify all drivers. I just added my idea to your patch and modified some of your code to be more simple. I _think_ I have covered all possible scenarios now, resulting in the need to keep the backend id check in case the backend died during the early init phase of the device. Could you please verify the attached patch is working for you? Juergen
On Thu, Jan 29, 2026 at 08:02:35AM +0100, Jürgen Groß wrote:
> On 26.01.26 08:08, Jürgen Groß wrote:
> > On 17.11.25 12:06, Jürgen Groß wrote:
> > > On 02.11.25 04:20, Marek Marczykowski-Górecki wrote:
> > > > When the backend domain crashes, coordinated device cleanup is not
> > > > possible (as it involves waiting for the backend state change). In that
> > > > case, toolstack forcefully removes frontend xenstore entries.
> > > > xenbus_dev_changed() handles this case, and triggers device cleanup.
> > > > It's possible that toolstack manages to connect new device in that
> > > > place, before xenbus_dev_changed() notices the old one is missing. If
> > > > that happens, new one won't be probed and will forever remain in
> > > > XenbusStateInitialising.
> > > >
> > > > Fix this by checking backend-id and if it changes, consider it
> > > > unplug+plug operation. It's important that cleanup on such unplug
> > > > doesn't modify xenstore entries (especially the "state" key) as it
> > > > belong to the new device to be probed - changing it would derail
> > > > establishing connection to the new backend (most likely, closing the
> > > > device before it was even connected). Handle this case by setting new
> > > > xenbus_device->vanished flag to true, and check it before changing state
> > > > entry.
> > > >
> > > > And even if xenbus_dev_changed() correctly detects the device was
> > > > forcefully removed, the cleanup handling is still racy. Since this whole
> > > > handling doesn't happend in a single xenstore transaction, it's possible
> > > > that toolstack might put a new device there already. Avoid re-creating
> > > > the state key (which in the case of loosing the race would actually
> > > > close newly attached device).
> > > >
> > > > The problem does not apply to frontend domain crash, as this case
> > > > involves coordinated cleanup.
> > > >
> > > > Problem originally reported at
> > > > https://lore.kernel.org/xen-devel/aOZvivyZ9YhVWDLN@mail-itl/T/#t,
> > > > including reproduction steps.
> > > >
> > > > Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
> > >
> > > Sorry I didn't get earlier to this.
> > >
> > > My main problem with this patch is that it is basically just papering over
> > > a more general problem.
> > >
> > > You are just making the problem much more improbable, but not impossible to
> > > occur again. In case the new driver domain has the same domid as the old one
> > > you can still have the same race.
> > >
> > > The clean way to handle that would be to add a unique Id in Xenstore to each
> > > device on the backend side, which can be tested on the frontend side to
> > > match. In case it doesn't match, an old device with the same kind and devid
> > > can be cleaned up.
> > >
> > > The unique Id would obviously need to be set by the Xen tools inside the
> > > transaction writing the initial backend Xenstore nodes, as doing that from
> > > the backend would add another potential ambiguity by the driver domain
> > > choosing the same unique id as the previous one did.
> > >
> > > The question is whether something like your patch should be used as a
> > > fallback in case there is no unique Id on the backend side of the device
> > > due to a too old Xen version.
> >
> > I think I have found a solution which is much more simple, as it doesn't
> > need any change of the protocol or any addition of new identifiers.
> >
> > When creating a new PV device, Xen tools will always write all generic
> > frontend- and backend-nodes. This includes the frontend state, which is
> > initialized as XenbusStateInitialising.
> >
> > The Linux kernel's xenbus driver is already storing the last known state
> > of a xenbus device in struct xenbus_device. When changing the state, the
> > xenbus driver is even reading the state from Xenstore (even if only for
> > making sure the path is still existing). So all what is needed is to check,
> > whether the read current state is matching the locally saved state. If it
> > is not matching AND the read state is XenbusStateInitialising, you can be
> > sure that the backend has been replaced.
> >
> > Handling this will need to check the return value of xenbus_switch_state()
> > in all related drivers, but this is just a more or less mechanical change.
> >
> > I'll prepare a patch series for that.
>
> In the end the result is more like your patch, avoiding the need to modify
> all drivers.
>
> I just added my idea to your patch and modified some of your code to be more
> simple. I _think_ I have covered all possible scenarios now, resulting in
> the need to keep the backend id check in case the backend died during the
> early init phase of the device.
>
> Could you please verify the attached patch is working for you?
Thanks for the patch!
I ran it through relevant tests, and I got inconsistent results.
Specifically, sometimes, the domU hangs (actually, just one vCPU spins
inside xenwatch thread). Last console messages are:
systemd[626]: Starting dconf.service - User preferences database...
gnome-keyring-daemon[975]: ␛[0;1;39mcouldn't access control socket: /run/user/1000/keyring/control: No such file or directory␛[0m
gnome-keyring-daemon[975]: ␛[0;1;38:5:185mdiscover_other_daemon: 0␛[0m
xen vif-0: xenbus: state reset occurred, reconnecting
gnome-keyring-daemon[974]: ␛[0;1;39mcouldn't access control socket: /run/user/1000/keyring/control: No such file or directory␛[0m
gnome-keyring-daemon[976]: ␛[0;1;39mcouldn't access control socket: /run/user/1000/keyring/control: No such file or directory␛[0m
gnome-keyring-daemon[976]: ␛[0;1;38:5:185mdiscover_other_daemon: 0␛[0m
gnome-keyring-daemon[974]: ␛[0;1;38:5:185mdiscover_other_daemon: 0␛[0m
xen vif-0: xenbus: state reset occurred, reconnecting
systemd[626]: Started dconf.service - User preferences database.
xen_netfront: Initialising Xen virtual ethernet driver
vif vif-0: xenbus: state reset occurred, reconnecting
And the call trace of the spinning xenwatch thread is:
task:xenwatch state:D stack:0 pid:64 tgid:64 ppid:2 task_flags:0x288040 flags:0x00080000
Call Trace:
<TASK>
__schedule+0x2f3/0x780
schedule+0x27/0x80
xs_wait_for_reply+0xab/0x1f0
? __pfx_autoremove_wake_function+0x10/0x10
xs_talkv+0xec/0x200
xs_single+0x4a/0x70
xenbus_gather+0xe4/0x1a0
xenbus_read_driver_state+0x42/0x70
xennet_bus_close+0x113/0x2c0 [xen_netfront]
? __pfx_autoremove_wake_function+0x10/0x10
xennet_remove+0x16/0x80 [xen_netfront]
xenbus_dev_remove+0x71/0xf0
device_release_driver_internal+0x19c/0x200
bus_remove_device+0xc6/0x130
device_del+0x160/0x3e0
device_unregister+0x17/0x60
xenbus_dev_changed.cold+0x5e/0x6b
? __pfx_xenwatch_thread+0x10/0x10
xenwatch_thread+0x92/0x1c0
? __pfx_autoremove_wake_function+0x10/0x10
kthread+0xfc/0x240
? __pfx_kthread+0x10/0x10
ret_from_fork+0xf5/0x110
? __pfx_kthread+0x10/0x10
ret_from_fork_asm+0x1a/0x30
</TASK>
task:xenbus state:S stack:0 pid:63 tgid:63 ppid:2 task_flags:0x208040 flags:0x00080000
Call Trace:
<TASK>
__schedule+0x2f3/0x780
? __pfx_xenbus_thread+0x10/0x10
schedule+0x27/0x80
xenbus_thread+0x1a8/0x200
? __pfx_autoremove_wake_function+0x10/0x10
kthread+0xfc/0x240
? __pfx_kthread+0x10/0x10
ret_from_fork+0xf5/0x110
? __pfx_kthread+0x10/0x10
ret_from_fork_asm+0x1a/0x30
</TASK>
(technically, `top` says it's the xenbus thread spinning, but it looks
like the actual issue is in xenwatch one)
Note that other xenwatch actions in this domU are not executed, for
example `xl sysrq` does nothing. Not surprising, given xenwatch thread
is busy... Fortunately, it blocks only a single vCPU, so I'm able to
interact with the domU over console (to get the above traces).
It isn't a reliable failure, in this test run it failed once, out of 4
related tests.
The specific test is: https://github.com/QubesOS/qubes-core-admin/blob/main/qubes/tests/integ/network.py#L234
In short:
1. Start a domU
2. Pause it
3. Attach network (backend is != dom0)
4. Unpause
TBH, I'm not sure why the "state reset occurred" message is triggered at
all, I think it shouldn't be in this case...
--
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab
Ping?
On Sun, Nov 02, 2025 at 04:20:12AM +0100, Marek Marczykowski-Górecki wrote:
> When the backend domain crashes, coordinated device cleanup is not
> possible (as it involves waiting for the backend state change). In that
> case, toolstack forcefully removes frontend xenstore entries.
> xenbus_dev_changed() handles this case, and triggers device cleanup.
> It's possible that toolstack manages to connect new device in that
> place, before xenbus_dev_changed() notices the old one is missing. If
> that happens, new one won't be probed and will forever remain in
> XenbusStateInitialising.
>
> Fix this by checking backend-id and if it changes, consider it
> unplug+plug operation. It's important that cleanup on such unplug
> doesn't modify xenstore entries (especially the "state" key) as it
> belong to the new device to be probed - changing it would derail
> establishing connection to the new backend (most likely, closing the
> device before it was even connected). Handle this case by setting new
> xenbus_device->vanished flag to true, and check it before changing state
> entry.
>
> And even if xenbus_dev_changed() correctly detects the device was
> forcefully removed, the cleanup handling is still racy. Since this whole
> handling doesn't happend in a single xenstore transaction, it's possible
> that toolstack might put a new device there already. Avoid re-creating
> the state key (which in the case of loosing the race would actually
> close newly attached device).
>
> The problem does not apply to frontend domain crash, as this case
> involves coordinated cleanup.
>
> Problem originally reported at
> https://lore.kernel.org/xen-devel/aOZvivyZ9YhVWDLN@mail-itl/T/#t,
> including reproduction steps.
>
> Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
> ---
> I considered re-using one of existing fields instead of a new
> xenbus_device->vanished, but I wasn't sure if that would work better.
> Setting xenbus_device->nodename to NULL would prevent few other places
> using it (including some log messages). Setting xenbus_device->otherend
> might have less unintentional impact, but logically it doesn't feel
> correct.
>
> With this patch applied, I cannot reproduce the issue anymore - neither
> with the simplified reproducer script, nor with the full test suite.
> ---
> drivers/xen/xenbus/xenbus_client.c | 2 ++
> drivers/xen/xenbus/xenbus_probe.c | 25 +++++++++++++++++++++++++
> include/xen/xenbus.h | 1 +
> 3 files changed, 28 insertions(+)
>
> diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
> index e73ec225d4a61..ce2f49d9aa4ad 100644
> --- a/drivers/xen/xenbus/xenbus_client.c
> +++ b/drivers/xen/xenbus/xenbus_client.c
> @@ -275,6 +275,8 @@ __xenbus_switch_state(struct xenbus_device *dev,
> */
> int xenbus_switch_state(struct xenbus_device *dev, enum xenbus_state state)
> {
> + if (dev->vanished)
> + return 0;
> return __xenbus_switch_state(dev, state, 0);
> }
>
> diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
> index 86fe6e7790566..3c3e56b544976 100644
> --- a/drivers/xen/xenbus/xenbus_probe.c
> +++ b/drivers/xen/xenbus/xenbus_probe.c
> @@ -444,6 +444,9 @@ static void xenbus_cleanup_devices(const char *path, struct bus_type *bus)
> info.dev = NULL;
> bus_for_each_dev(bus, NULL, &info, cleanup_dev);
> if (info.dev) {
> + dev_warn(&info.dev->dev,
> + "device forcefully removed from xenstore\n");
> + info.dev->vanished = true;
> device_unregister(&info.dev->dev);
> put_device(&info.dev->dev);
> }
> @@ -659,6 +662,28 @@ void xenbus_dev_changed(const char *node, struct xen_bus_type *bus)
> return;
>
> dev = xenbus_device_find(root, &bus->bus);
> + /* Backend domain crash results in not coordinated frontend removal,
> + * without going through XenbusStateClosing. Check if the device
> + * wasn't replaced to point at another backend in the meantime.
> + */
> + if (dev && !strncmp(node, "device/", sizeof("device/")-1)) {
> + int backend_id;
> + int err = xenbus_gather(XBT_NIL, root,
> + "backend-id", "%i", &backend_id,
> + NULL);
> + if (!err && backend_id != dev->otherend_id) {
> + /* It isn't the same device, assume the old one
> + * vanished and new one needs to be probed.
> + */
> + dev_warn(&dev->dev,
> + "backend-id mismatch (%d != %d), reconnecting\n",
> + backend_id, dev->otherend_id);
> + dev->vanished = true;
> + device_unregister(&dev->dev);
> + put_device(&dev->dev);
> + dev = NULL;
> + }
> + }
> if (!dev)
> xenbus_probe_node(bus, type, root);
> else
> diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h
> index 7dab04cf4a36c..43a5335f1d5a3 100644
> --- a/include/xen/xenbus.h
> +++ b/include/xen/xenbus.h
> @@ -87,6 +87,7 @@ struct xenbus_device {
> struct completion down;
> struct work_struct work;
> struct semaphore reclaim_sem;
> + bool vanished;
>
> /* Event channel based statistics and settings. */
> atomic_t event_channels;
> --
> 2.51.0
>
--
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab
© 2016 - 2026 Red Hat, Inc.