| Message ID | 1452634390-17729-2-git-send-email-jacob.e.keller@intel.com |
|---|---|
| State | Changes Requested |
| Headers | show |
Hi Jacob,
[auto build test ERROR on vfio/next]
[also build test ERROR on v4.4 next-20160112]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/Jacob-Keller/driver-add-manual_bind_only-option-for-virtual-stub-drivers/20160113-053451
base: https://github.com/awilliam/linux-vfio.git next
config: x86_64-randconfig-x012-01110856 (attached as .config)
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All errors (new ones prefixed by >>):
>> drivers/vfio/pci/vfio_pci.c:1049:27: error: expected '}' before ';' token
.manual_bind_only = true;
^
vim +1049 drivers/vfio/pci/vfio_pci.c
1043 .name = "vfio-pci",
1044 .id_table = NULL, /* only dynamic ids */
1045 .probe = vfio_pci_probe,
1046 .remove = vfio_pci_remove,
1047 .err_handler = &vfio_err_handlers,
1048 .driver = {
> 1049 .manual_bind_only = true;
1050 },
1051 };
1052
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Hi Jacob,
[auto build test WARNING on vfio/next]
[also build test WARNING on v4.4 next-20160112]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/Jacob-Keller/driver-add-manual_bind_only-option-for-virtual-stub-drivers/20160113-053451
base: https://github.com/awilliam/linux-vfio.git next
reproduce: make htmldocs
All warnings (new ones prefixed by >>):
include/linux/init.h:1: warning: no structured comments found
kernel/sys.c:1: warning: no structured comments found
>> include/linux/device.h:283: warning: No description found for parameter 'manual_bind_only'
drivers/dma-buf/seqno-fence.c:1: warning: no structured comments found
drivers/dma-buf/reservation.c:1: warning: no structured comments found
include/linux/reservation.h:1: warning: no structured comments found
include/linux/hsi/hsi.h:150: warning: Excess struct/union/enum/typedef member 'e_handler' description in 'hsi_client'
include/linux/hsi/hsi.h:150: warning: Excess struct/union/enum/typedef member 'pclaimed' description in 'hsi_client'
include/linux/hsi/hsi.h:150: warning: Excess struct/union/enum/typedef member 'nb' description in 'hsi_client'
vim +/manual_bind_only +283 include/linux/device.h
f98ec3ac Jacob Keller 2016-01-12 267 bool manual_bind_only; /* prevent bind on driver_attach */
765230b5 Dmitry Torokhov 2015-03-30 268 enum probe_type probe_type;
1a6f2a75 Dmitry Torokhov 2009-10-12 269
597b9d1e Grant Likely 2010-04-13 270 const struct of_device_id *of_match_table;
06f64c8f Mika Westerberg 2012-10-31 271 const struct acpi_device_id *acpi_match_table;
597b9d1e Grant Likely 2010-04-13 272
^1da177e Linus Torvalds 2005-04-16 273 int (*probe) (struct device *dev);
^1da177e Linus Torvalds 2005-04-16 274 int (*remove) (struct device *dev);
^1da177e Linus Torvalds 2005-04-16 275 void (*shutdown) (struct device *dev);
9480e307 Russell King 2005-10-28 276 int (*suspend) (struct device *dev, pm_message_t state);
9480e307 Russell King 2005-10-28 277 int (*resume) (struct device *dev);
a4dbd674 David Brownell 2009-06-24 278 const struct attribute_group **groups;
e5dd1278 Greg Kroah-Hartman 2007-11-28 279
8150f32b Dmitry Torokhov 2009-07-24 280 const struct dev_pm_ops *pm;
1eede070 Rafael J. Wysocki 2008-05-20 281
e5dd1278 Greg Kroah-Hartman 2007-11-28 282 struct driver_private *p;
^1da177e Linus Torvalds 2005-04-16 @283 };
^1da177e Linus Torvalds 2005-04-16 284
^1da177e Linus Torvalds 2005-04-16 285
4a7fb636 Andrew Morton 2006-08-14 286 extern int __must_check driver_register(struct device_driver *drv);
^1da177e Linus Torvalds 2005-04-16 287 extern void driver_unregister(struct device_driver *drv);
^1da177e Linus Torvalds 2005-04-16 288
d462943a Greg Kroah-Hartman 2008-01-24 289 extern struct device_driver *driver_find(const char *name,
d462943a Greg Kroah-Hartman 2008-01-24 290 struct bus_type *bus);
d779249e Greg Kroah-Hartman 2006-07-18 291 extern int driver_probe_done(void);
:::::: The code at line 283 was first introduced by commit
:::::: 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2 Linux-2.6.12-rc2
:::::: TO: Linus Torvalds <torvalds@ppc970.osdl.org>
:::::: CC: Linus Torvalds <torvalds@ppc970.osdl.org>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index a641cf3ccad6..e21bf1d67168 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -491,6 +491,9 @@ static int __device_attach_driver(struct device_driver *drv, void *_data) struct device *dev = data->dev; bool async_allowed; + if (drv->manual_bind_only) + return 0; + /* * Check if device has already been claimed. This may * happen with driver loading, device discovery/registration, @@ -632,6 +635,9 @@ static int __driver_attach(struct device *dev, void *data) * is an error. */ + if (drv->manual_bind_only) + return 0; + if (!driver_match_device(drv, dev)) return 0; diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index 56bf6dbb93db..82f139854b56 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -1045,6 +1045,9 @@ static struct pci_driver vfio_pci_driver = { .probe = vfio_pci_probe, .remove = vfio_pci_remove, .err_handler = &vfio_err_handlers, + .driver = { + .manual_bind_only = true; + }, }; struct vfio_devices { diff --git a/drivers/vfio/platform/vfio_platform.c b/drivers/vfio/platform/vfio_platform.c index b1cc3a768784..91138ac6d1a8 100644 --- a/drivers/vfio/platform/vfio_platform.c +++ b/drivers/vfio/platform/vfio_platform.c @@ -92,6 +92,7 @@ static struct platform_driver vfio_platform_driver = { .remove = vfio_platform_remove, .driver = { .name = "vfio-platform", + .manual_bind_only = true; }, }; diff --git a/include/linux/device.h b/include/linux/device.h index b8f411b57dcb..de755bb64994 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -264,6 +264,7 @@ struct device_driver { const char *mod_name; /* used for built-in modules */ bool suppress_bind_attrs; /* disables bind/unbind via sysfs */ + bool manual_bind_only; /* prevent bind on driver_attach */ enum probe_type probe_type; const struct of_device_id *of_match_table;
The vfio-pci and vfio-platform drivers are intended to be used as stub drivers which can bind to any pci or platform device and are used to enable direct assignment of a host device to a guest virtual machine using IOMMU. However, today, these drivers will bind on device or driver attach, once given a dynamic id to match against. This can cause problems as the drivers may attach to devices that match an id but haven't specifically been requested using the sysfs bind interface. Add a boolean "manual_bind_only" which can be set by drivers which should only bind to devices if they have been explicitly added using the sysfs bind flow. This prevents these drivers from taking control of devices unintentionally. Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> --- drivers/base/dd.c | 6 ++++++ drivers/vfio/pci/vfio_pci.c | 3 +++ drivers/vfio/platform/vfio_platform.c | 1 + include/linux/device.h | 1 + 4 files changed, 11 insertions(+)