| Message ID | 1445603835-14506-7-git-send-email-eric.auger@linaro.org |
|---|---|
| State | Accepted |
| Commit | e9e0506ee60dd79714c59457f4301c602786defc |
| Headers | show |
On Friday 23 October 2015 14:37:14 Eric Auger wrote: > Remove the static lookup table and use the dynamic list of registered > reset functions instead. Also load the reset module through its alias. > The reset struct module pointer is stored in vfio_platform_device. > > We also remove the useless struct device pointer parameter in > vfio_platform_get_reset. > > This patch fixes the issue related to the usage of __symbol_get, which > besides from being moot, prevented compilation with CONFIG_MODULES > disabled. > > Also usage of MODULE_ALIAS makes possible to add a new reset module > without needing to update the framework. This was suggested by Arnd. > > Signed-off-by: Eric Auger <eric.auger@linaro.org> > Reported-by: Arnd Bergmann <arnd@arndb.de> > > Reviewed-by: Arnd Bergmann <arnd@arndb.de> but doesn't this need to come before patch 4/7? Arnd
Hi Arnd, On 10/23/2015 03:12 PM, Arnd Bergmann wrote: > On Friday 23 October 2015 14:37:14 Eric Auger wrote: >> Remove the static lookup table and use the dynamic list of registered >> reset functions instead. Also load the reset module through its alias. >> The reset struct module pointer is stored in vfio_platform_device. >> >> We also remove the useless struct device pointer parameter in >> vfio_platform_get_reset. >> >> This patch fixes the issue related to the usage of __symbol_get, which >> besides from being moot, prevented compilation with CONFIG_MODULES >> disabled. >> >> Also usage of MODULE_ALIAS makes possible to add a new reset module >> without needing to update the framework. This was suggested by Arnd. >> >> Signed-off-by: Eric Auger <eric.auger@linaro.org> >> Reported-by: Arnd Bergmann <arnd@arndb.de> >> >> > Reviewed-by: Arnd Bergmann <arnd@arndb.de> > > but doesn't this need to come before patch 4/7? Well I don't think so. In [4] we introduce the dynamic registration method but until this patch we still use the old lookup method in the static table. I tested and the reset lookup still works in [4]. If we put this one before the registration, the functionality will be lost here. Eric > Arnd >
On Friday 23 October 2015 16:11:08 Eric Auger wrote: > Hi Arnd, > On 10/23/2015 03:12 PM, Arnd Bergmann wrote: > > On Friday 23 October 2015 14:37:14 Eric Auger wrote: > >> Remove the static lookup table and use the dynamic list of registered > >> reset functions instead. Also load the reset module through its alias. > >> The reset struct module pointer is stored in vfio_platform_device. > >> > >> We also remove the useless struct device pointer parameter in > >> vfio_platform_get_reset. > >> > >> This patch fixes the issue related to the usage of __symbol_get, which > >> besides from being moot, prevented compilation with CONFIG_MODULES > >> disabled. > >> > >> Also usage of MODULE_ALIAS makes possible to add a new reset module > >> without needing to update the framework. This was suggested by Arnd. > >> > >> Signed-off-by: Eric Auger <eric.auger@linaro.org> > >> Reported-by: Arnd Bergmann <arnd@arndb.de> > >> > >> > > Reviewed-by: Arnd Bergmann <arnd@arndb.de> > > > > but doesn't this need to come before patch 4/7? > Well I don't think so. In [4] we introduce the dynamic registration > method but until this patch we still use the old lookup method in the > static table. I tested and the reset lookup still works in [4]. > If we put this one before the registration, the functionality will be > lost here. > Ok, I see. I was getting confused by the removal of the EXPORT_SYMBOL statement there and thought it would break the __get_symbol call. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On 10/23/2015 04:23 PM, Arnd Bergmann wrote: > On Friday 23 October 2015 16:11:08 Eric Auger wrote: >> Hi Arnd, >> On 10/23/2015 03:12 PM, Arnd Bergmann wrote: >>> On Friday 23 October 2015 14:37:14 Eric Auger wrote: >>>> Remove the static lookup table and use the dynamic list of registered >>>> reset functions instead. Also load the reset module through its alias. >>>> The reset struct module pointer is stored in vfio_platform_device. >>>> >>>> We also remove the useless struct device pointer parameter in >>>> vfio_platform_get_reset. >>>> >>>> This patch fixes the issue related to the usage of __symbol_get, which >>>> besides from being moot, prevented compilation with CONFIG_MODULES >>>> disabled. >>>> >>>> Also usage of MODULE_ALIAS makes possible to add a new reset module >>>> without needing to update the framework. This was suggested by Arnd. >>>> >>>> Signed-off-by: Eric Auger <eric.auger@linaro.org> >>>> Reported-by: Arnd Bergmann <arnd@arndb.de> >>>> >>>> >>> Reviewed-by: Arnd Bergmann <arnd@arndb.de> >>> >>> but doesn't this need to come before patch 4/7? >> Well I don't think so. In [4] we introduce the dynamic registration >> method but until this patch we still use the old lookup method in the >> static table. I tested and the reset lookup still works in [4]. >> If we put this one before the registration, the functionality will be >> lost here. >> > > Ok, I see. I was getting confused by the removal of the EXPORT_SYMBOL > statement there and thought it would break the __get_symbol call. Hum no actually you're right. I checked the reset module was loaded but effectly the _get_symbol fails. So if I want to keep the functionality all along the series I need to remove the EXPORT_SYMBOL when I swap the lookup method. Thanks Eric > > Arnd > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c index 50a388b..de3fb33 100644 --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c @@ -30,37 +30,43 @@ static LIST_HEAD(reset_list); static DEFINE_MUTEX(driver_lock); -static const struct vfio_platform_reset_combo reset_lookup_table[] = { - { - .compat = "calxeda,hb-xgmac", - .reset_function_name = "vfio_platform_calxedaxgmac_reset", - .module_name = "vfio-platform-calxedaxgmac", - }, -}; - -static void vfio_platform_get_reset(struct vfio_platform_device *vdev, - struct device *dev) +static vfio_platform_reset_fn_t vfio_platform_lookup_reset(const char *compat, + struct module **module) { - int (*reset)(struct vfio_platform_device *); - int i; + struct vfio_platform_reset_node *iter; + vfio_platform_reset_fn_t reset_fn = NULL; - for (i = 0 ; i < ARRAY_SIZE(reset_lookup_table); i++) { - if (!strcmp(reset_lookup_table[i].compat, vdev->compat)) { - request_module(reset_lookup_table[i].module_name); - reset = __symbol_get( - reset_lookup_table[i].reset_function_name); - if (reset) { - vdev->reset = reset; - return; - } + mutex_lock(&driver_lock); + list_for_each_entry(iter, &reset_list, link) { + if (!strcmp(iter->compat, compat) && + try_module_get(iter->owner)) { + *module = iter->owner; + reset_fn = iter->reset; + break; } } + mutex_unlock(&driver_lock); + return reset_fn; +} + +static void vfio_platform_get_reset(struct vfio_platform_device *vdev) +{ + char modname[256]; + + vdev->reset = vfio_platform_lookup_reset(vdev->compat, + &vdev->reset_module); + if (!vdev->reset) { + snprintf(modname, 256, "vfio-reset:%s", vdev->compat); + request_module(modname); + vdev->reset = vfio_platform_lookup_reset(vdev->compat, + &vdev->reset_module); + } } static void vfio_platform_put_reset(struct vfio_platform_device *vdev) { if (vdev->reset) - symbol_put_addr(vdev->reset); + module_put(vdev->reset_module); } static int vfio_platform_regions_init(struct vfio_platform_device *vdev) @@ -557,7 +563,7 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev, return ret; } - vfio_platform_get_reset(vdev, dev); + vfio_platform_get_reset(vdev); mutex_init(&vdev->igate); diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h index f8072d8..e505c15 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -58,6 +58,7 @@ struct vfio_platform_device { struct mutex igate; struct module *parent_module; const char *compat; + struct module *reset_module; /* * These fields should be filled by the bus specific binder @@ -81,12 +82,6 @@ struct vfio_platform_reset_node { vfio_platform_reset_fn_t reset; }; -struct vfio_platform_reset_combo { - const char *compat; - const char *reset_function_name; - const char *module_name; -}; - extern int vfio_platform_probe_common(struct vfio_platform_device *vdev, struct device *dev); extern struct vfio_platform_device *vfio_platform_remove_common
Remove the static lookup table and use the dynamic list of registered reset functions instead. Also load the reset module through its alias. The reset struct module pointer is stored in vfio_platform_device. We also remove the useless struct device pointer parameter in vfio_platform_get_reset. This patch fixes the issue related to the usage of __symbol_get, which besides from being moot, prevented compilation with CONFIG_MODULES disabled. Also usage of MODULE_ALIAS makes possible to add a new reset module without needing to update the framework. This was suggested by Arnd. Signed-off-by: Eric Auger <eric.auger@linaro.org> Reported-by: Arnd Bergmann <arnd@arndb.de> --- v2 -> v3: - remove clear of vfio_platform_device reset_module and reset in vfio_platform_put_reset - single unlock in vfio_platform_lookup_reset - use driver_lock instead of reset_lock v1 -> v2: - use reset_lock in vfio_platform_lookup_reset - remove vfio_platform_reset_combo declaration - remove struct device *dev parameter in vfio_platform_get_reset - set reset_module and reset to NULL in put function --- drivers/vfio/platform/vfio_platform_common.c | 52 +++++++++++++++------------ drivers/vfio/platform/vfio_platform_private.h | 7 +--- 2 files changed, 30 insertions(+), 29 deletions(-)