Patch #1 is clean-up for an apparent mis-feature.
Paul Durrant (4):
xenbus: move xenbus_dev_shutdown() into frontend code...
xenbus: limit when state is forced to closed
xen/interface: re-define FRONT/BACK_RING_ATTACH()
xen-blkback: support dynamic unbind/bind
drivers/block/xen-blkback/xenbus.c | 56 +++++++++++++++-------
drivers/xen/xenbus/xenbus.h | 2 -
drivers/xen/xenbus/xenbus_probe.c | 35 ++++----------
drivers/xen/xenbus/xenbus_probe_backend.c | 1 -
drivers/xen/xenbus/xenbus_probe_frontend.c | 24 +++++++++-
include/xen/interface/io/ring.h | 29 ++++-------
include/xen/xenbus.h | 1 +
7 files changed, 81 insertions(+), 67 deletions(-)
---
v3:
- Only patch #4 modified
Cc: Boris Ostrovsky <[email protected]>
Cc: Jens Axboe <[email protected]>
Cc: Juergen Gross <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
Cc: Stefano Stabellini <[email protected]>
--
2.20.1
If a driver probe() fails then leave the xenstore state alone. There is no
reason to modify it as the failure may be due to transient resource
allocation issues and hence a subsequent probe() may succeed.
If the driver supports re-binding then only force state to closed during
remove() only in the case when the toolstack may need to clean up. This can
be detected by checking whether the state in xenstore has been set to
closing prior to device removal.
NOTE: Re-bind support is indicated by new boolean in struct xenbus_driver,
which defaults to false. Subsequent patches will add support to
some backend drivers.
Signed-off-by: Paul Durrant <[email protected]>
---
Cc: Boris Ostrovsky <[email protected]>
Cc: Juergen Gross <[email protected]>
Cc: Stefano Stabellini <[email protected]>
v2:
- Introduce the 'allow_rebind' flag
- Expand the commit comment
---
drivers/xen/xenbus/xenbus_probe.c | 12 ++++++++++--
include/xen/xenbus.h | 1 +
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index 5aa29396c9e3..378486b79f96 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -255,7 +255,6 @@ int xenbus_dev_probe(struct device *_dev)
module_put(drv->driver.owner);
fail:
xenbus_dev_error(dev, err, "xenbus_dev_probe on %s", dev->nodename);
- xenbus_switch_state(dev, XenbusStateClosed);
return err;
}
EXPORT_SYMBOL_GPL(xenbus_dev_probe);
@@ -276,7 +275,16 @@ int xenbus_dev_remove(struct device *_dev)
free_otherend_details(dev);
- xenbus_switch_state(dev, XenbusStateClosed);
+ /*
+ * If the toolstack has forced the device state to closing then set
+ * the state to closed now to allow it to be cleaned up.
+ * Similarly, if the driver does not support re-bind, set the
+ * closed.
+ */
+ if (!drv->allow_rebind ||
+ xenbus_read_driver_state(dev->nodename) == XenbusStateClosing)
+ xenbus_switch_state(dev, XenbusStateClosed);
+
return 0;
}
EXPORT_SYMBOL_GPL(xenbus_dev_remove);
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h
index 869c816d5f8c..24228a102141 100644
--- a/include/xen/xenbus.h
+++ b/include/xen/xenbus.h
@@ -93,6 +93,7 @@ struct xenbus_device_id
struct xenbus_driver {
const char *name; /* defaults to ids[0].devicetype */
const struct xenbus_device_id *ids;
+ bool allow_rebind; /* avoid setting xenstore closed during remove */
int (*probe)(struct xenbus_device *dev,
const struct xenbus_device_id *id);
void (*otherend_changed)(struct xenbus_device *dev,
--
2.20.1
On 11.12.19 16:29, Paul Durrant wrote:
> If a driver probe() fails then leave the xenstore state alone. There is no
> reason to modify it as the failure may be due to transient resource
> allocation issues and hence a subsequent probe() may succeed.
>
> If the driver supports re-binding then only force state to closed during
> remove() only in the case when the toolstack may need to clean up. This can
> be detected by checking whether the state in xenstore has been set to
> closing prior to device removal.
>
> NOTE: Re-bind support is indicated by new boolean in struct xenbus_driver,
> which defaults to false. Subsequent patches will add support to
> some backend drivers.
>
> Signed-off-by: Paul Durrant <[email protected]>
Reviewed-by: Juergen Gross <[email protected]>
Juergen
On 11.12.19 16:29, Paul Durrant wrote:
> Patch #1 is clean-up for an apparent mis-feature.
>
> Paul Durrant (4):
> xenbus: move xenbus_dev_shutdown() into frontend code...
> xenbus: limit when state is forced to closed
> xen/interface: re-define FRONT/BACK_RING_ATTACH()
> xen-blkback: support dynamic unbind/bind
>
> drivers/block/xen-blkback/xenbus.c | 56 +++++++++++++++-------
> drivers/xen/xenbus/xenbus.h | 2 -
> drivers/xen/xenbus/xenbus_probe.c | 35 ++++----------
> drivers/xen/xenbus/xenbus_probe_backend.c | 1 -
> drivers/xen/xenbus/xenbus_probe_frontend.c | 24 +++++++++-
> include/xen/interface/io/ring.h | 29 ++++-------
> include/xen/xenbus.h | 1 +
> 7 files changed, 81 insertions(+), 67 deletions(-)
Series pushed to xen/tip.git for-linus-5.5b
Juergen