raw/ifpga: remove vdev when ifpga is closed
PATCH 1/1 raw/ifpga: remove vdev when ifpga is closed
Virtual devices created on ifpga raw device are not removed when ifpga is closed. To avoid such problem, ifpga virtual device remove function is implemented, virtual device is removed in raw device close function.
--- drivers/raw/ifpga/ifpga_rawdev.c | 137 +++++++++++++++++++++++++++++---------- drivers/raw/ifpga/ifpga_rawdev.h | 8 +++ 2 files changed, 109 insertions(+), 36 deletions(-)
drivers/raw/ifpga/ifpga_rawdev.c +101 -36
@@ -134,6 +134,8 @@ struct ifpga_rawdev *for (i =0 ; i <IFPGA_MAX_IRQ ; i++) dev->intr_handle[i] =NULL ; dev->poll_enabled =0 ; +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) + dev->vdev_name[i] =NULL ;return dev; }
@@ -735,10 +737,24 @@ static int set_surprise_link_check_aer(static int ifpga_rawdev_close (struct rte_rawdev *dev) { +struct ifpga_rawdev *ifpga_rdev =NULL ;struct opae_adapter *adapter; +char *vdev_name =NULL ; +int i =0 ;if (dev) { -ifpga_monitor_stop_func (ifpga_rawdev_get (dev)); + ifpga_rdev =ifpga_rawdev_get (dev); +if (ifpga_rdev) { +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { + vdev_name = ifpga_rdev->vdev_name[i]; +if (!rte_vdev_uninit (vdev_name)) { +rte_free (vdev_name); + ifpga_rdev->vdev_name[i] =NULL ; + } + } +ifpga_monitor_stop_func (ifpga_rdev); + ifpga_rdev->rawdev =NULL ; + } adapter =ifpga_rawdev_get_priv (dev);if (adapter) {opae_adapter_destroy (adapter);
@@ -1637,8 +1653,6 @@ static int fme_clean_fme_error(struct opae_manager *mgr)return -EINVAL ; } dev =ifpga_rawdev_get (rawdev); -if (dev) - dev->rawdev =NULL ; adapter =ifpga_rawdev_get_priv (rawdev);if (!adapter)
@@ -1713,73 +1727,113 @@ static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,return 0 ; } +static int -ifpga_cfg_probe (struct rte_vdev_device *dev) +ifpga_vdev_parse_devargs (struct rte_devargs *devargs, +struct ifpga_vdev_args *args) { -struct rte_devargs *devargs; -struct rte_kvargs *kvlist =NULL ; -struct rte_rawdev *rawdev =NULL ; -struct ifpga_rawdev *ifpga_dev; -int port; +struct rte_kvargs *kvlist;char *name =NULL ; -char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; -int ret =-1 ; +int port =0 ; +int ret = -EINVAL ; - devargs = dev->device.devargs; +if (!devargs || !args) +return ret; kvlist =rte_kvargs_parse (devargs->args, valid_args);if (!kvlist) { -IFPGA_RAWDEV_PMD_LOG (ERR ,"error when parsing param" ); - goto end; +IFPGA_RAWDEV_PMD_ERR ("error when parsing devargs" ); +return ret; }if (rte_kvargs_count (kvlist,IFPGA_ARG_NAME ) ==1 ) {if (rte_kvargs_process (kvlist,IFPGA_ARG_NAME , - &ifpga_rawdev_get_string_arg, - &name) <0 ) { + &ifpga_rawdev_get_string_arg, &name) <0 ) {IFPGA_RAWDEV_PMD_ERR ("error to parse %s" , -IFPGA_ARG_NAME ); +IFPGA_ARG_NAME ); goto end; + }else { +strlcpy (args->bdf, name,sizeof (args->bdf)); +rte_free (name); } }else {IFPGA_RAWDEV_PMD_ERR ("arg %s is mandatory for ifpga bus" , -IFPGA_ARG_NAME ); +IFPGA_ARG_NAME ); goto end; }if (rte_kvargs_count (kvlist,IFPGA_ARG_PORT ) ==1 ) { -if (rte_kvargs_process (kvlist, -IFPGA_ARG_PORT , - &rte_ifpga_get_integer32_arg, - &port) <0 ) { +if (rte_kvargs_process (kvlist,IFPGA_ARG_PORT , + &rte_ifpga_get_integer32_arg, &port) <0 ) {IFPGA_RAWDEV_PMD_ERR ("error to parse %s" ,IFPGA_ARG_PORT ); goto end; + }else { + args->port = port; } }else {IFPGA_RAWDEV_PMD_ERR ("arg %s is mandatory for ifpga bus" , -IFPGA_ARG_PORT ); +IFPGA_ARG_PORT ); goto end; } + ret =0 ; + +end: +if (kvlist) +rte_kvargs_free (kvlist); + +return ret; +} + +static int +ifpga_cfg_probe (struct rte_vdev_device *vdev) +{ +struct rte_rawdev *rawdev =NULL ; +struct ifpga_rawdev *ifpga_dev; +struct ifpga_vdev_args args; +char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; +int i, n, ret =0 ; + +IFPGA_RAWDEV_PMD_INFO ("probe ifpga_rawdev_cfg %s" , vdev->device.name); + + ret =ifpga_vdev_parse_devargs (vdev->device.devargs, &args); +if (ret) +return ret; +memset (dev_name,0 ,sizeof (dev_name)); -snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"IFPGA:%s" , name); +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"IFPGA:%s" , args.bdf); rawdev =rte_rawdev_pmd_get_named_dev (dev_name);if (!rawdev) - goto end; +return -ENODEV ; ifpga_dev =ifpga_rawdev_get (rawdev);if (!ifpga_dev) - goto end; +return -ENODEV ; -memset (dev_name,0 ,sizeof (dev_name)); -snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , - port, name); +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { +if (ifpga_dev->vdev_name[i] ==NULL ) { + n =strlen (vdev->device.name) +1 ; + ifpga_dev->vdev_name[i] =rte_malloc (NULL , n,0 ); +if (ifpga_dev->vdev_name[i] ==NULL ) +return -ENOMEM ; +strlcpy (ifpga_dev->vdev_name[i], vdev->device.name, n); +break ; + } + } + +if (i >=IFPGA_MAX_VDEV ) { +IFPGA_RAWDEV_PMD_ERR ("Can't create more virtual device!" ); +return -ENOENT ; + } +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , + args.port, args.bdf); ret =rte_eal_hotplug_add (RTE_STR (IFPGA_BUS_NAME ), - dev_name, devargs->args); -end: -rte_kvargs_free (kvlist); -free (name); + dev_name, vdev->device.devargs->args); +if (ret) { +rte_free (ifpga_dev->vdev_name[i]); + ifpga_dev->vdev_name[i] =NULL ; + }return ret; }
@@ -1787,10 +1841,21 @@ static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,static int ifpga_cfg_remove (struct rte_vdev_device *vdev) { -IFPGA_RAWDEV_PMD_INFO ("Remove ifpga_cfg %p" , - vdev); +struct ifpga_vdev_args args; +char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; +int ret =0 ; -return 0 ; +IFPGA_RAWDEV_PMD_INFO ("remove ifpga_rawdev_cfg %s" , vdev->device.name); + + ret =ifpga_vdev_parse_devargs (vdev->device.devargs, &args); +if (ret) +return ret; + +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , + args.port, args.bdf); + ret =rte_eal_hotplug_remove (RTE_STR (IFPGA_BUS_NAME ), dev_name); + +return ret; }static struct rte_vdev_driver ifpga_cfg_driver = {
drivers/raw/ifpga/ifpga_rawdev.h +8 -0
@@ -50,6 +50,7 @@ enum ifpga_rawdev_device_state {#define IFPGA_RAWDEV_MSIX_IRQ_NUM 7#define IFPGA_RAWDEV_NUM 32 +#define IFPGA_MAX_VDEV 4#define IFPGA_MAX_IRQ 12struct ifpga_rawdev {
@@ -64,6 +65,13 @@ struct ifpga_rawdev {void *intr_handle[IFPGA_MAX_IRQ ];/* enable monitor thread poll device's sensors or not */ int poll_enabled; +/* name of virtual devices created on raw device */ +char *vdev_name[IFPGA_MAX_VDEV ]; +}; + +struct ifpga_vdev_args { +char bdf[8 ]; +int port; }; struct ifpga_rawdev *
Signature · 1 line
1.8.3.1
PATCH v2 1/1 raw/ifpga: remove vdev when ifpga is closed
Virtual devices created on ifpga raw device are not removed when ifpga is closed. To avoid such problem, ifpga virtual device remove function is implemented, virtual device is removed in raw device close function.
---
v2: cleanup vdev_name no matter rte_vdev_uninit succeed or not
--- drivers/raw/ifpga/ifpga_rawdev.c | 138 +++++++++++++++++++++++++++++---------- drivers/raw/ifpga/ifpga_rawdev.h | 8 +++ 2 files changed, 110 insertions(+), 36 deletions(-)
drivers/raw/ifpga/ifpga_rawdev.c +102 -36
@@ -134,6 +134,8 @@ struct ifpga_rawdev *for (i =0 ; i <IFPGA_MAX_IRQ ; i++) dev->intr_handle[i] =NULL ; dev->poll_enabled =0 ; +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) + dev->vdev_name[i] =NULL ;return dev; }
@@ -735,10 +737,25 @@ static int set_surprise_link_check_aer(static int ifpga_rawdev_close (struct rte_rawdev *dev) { +struct ifpga_rawdev *ifpga_rdev =NULL ;struct opae_adapter *adapter; +char *vdev_name =NULL ; +int i =0 ;if (dev) { -ifpga_monitor_stop_func (ifpga_rawdev_get (dev)); + ifpga_rdev =ifpga_rawdev_get (dev); +if (ifpga_rdev) { +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { + vdev_name = ifpga_rdev->vdev_name[i]; +if (vdev_name) { +rte_vdev_uninit (vdev_name); +rte_free (vdev_name); + ifpga_rdev->vdev_name[i] =NULL ; + } + } +ifpga_monitor_stop_func (ifpga_rdev); + ifpga_rdev->rawdev =NULL ; + } adapter =ifpga_rawdev_get_priv (dev);if (adapter) {opae_adapter_destroy (adapter);
@@ -1637,8 +1654,6 @@ static int fme_clean_fme_error(struct opae_manager *mgr)return -EINVAL ; } dev =ifpga_rawdev_get (rawdev); -if (dev) - dev->rawdev =NULL ; adapter =ifpga_rawdev_get_priv (rawdev);if (!adapter)
@@ -1713,73 +1728,113 @@ static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,return 0 ; } +static int -ifpga_cfg_probe (struct rte_vdev_device *dev) +ifpga_vdev_parse_devargs (struct rte_devargs *devargs, +struct ifpga_vdev_args *args) { -struct rte_devargs *devargs; -struct rte_kvargs *kvlist =NULL ; -struct rte_rawdev *rawdev =NULL ; -struct ifpga_rawdev *ifpga_dev; -int port; +struct rte_kvargs *kvlist;char *name =NULL ; -char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; -int ret =-1 ; +int port =0 ; +int ret = -EINVAL ; - devargs = dev->device.devargs; +if (!devargs || !args) +return ret; kvlist =rte_kvargs_parse (devargs->args, valid_args);if (!kvlist) { -IFPGA_RAWDEV_PMD_LOG (ERR ,"error when parsing param" ); - goto end; +IFPGA_RAWDEV_PMD_ERR ("error when parsing devargs" ); +return ret; }if (rte_kvargs_count (kvlist,IFPGA_ARG_NAME ) ==1 ) {if (rte_kvargs_process (kvlist,IFPGA_ARG_NAME , - &ifpga_rawdev_get_string_arg, - &name) <0 ) { + &ifpga_rawdev_get_string_arg, &name) <0 ) {IFPGA_RAWDEV_PMD_ERR ("error to parse %s" , -IFPGA_ARG_NAME ); +IFPGA_ARG_NAME ); goto end; + }else { +strlcpy (args->bdf, name,sizeof (args->bdf)); +rte_free (name); } }else {IFPGA_RAWDEV_PMD_ERR ("arg %s is mandatory for ifpga bus" , -IFPGA_ARG_NAME ); +IFPGA_ARG_NAME ); goto end; }if (rte_kvargs_count (kvlist,IFPGA_ARG_PORT ) ==1 ) { -if (rte_kvargs_process (kvlist, -IFPGA_ARG_PORT , - &rte_ifpga_get_integer32_arg, - &port) <0 ) { +if (rte_kvargs_process (kvlist,IFPGA_ARG_PORT , + &rte_ifpga_get_integer32_arg, &port) <0 ) {IFPGA_RAWDEV_PMD_ERR ("error to parse %s" ,IFPGA_ARG_PORT ); goto end; + }else { + args->port = port; } }else {IFPGA_RAWDEV_PMD_ERR ("arg %s is mandatory for ifpga bus" , -IFPGA_ARG_PORT ); +IFPGA_ARG_PORT ); goto end; } + ret =0 ; + +end: +if (kvlist) +rte_kvargs_free (kvlist); + +return ret; +} + +static int +ifpga_cfg_probe (struct rte_vdev_device *vdev) +{ +struct rte_rawdev *rawdev =NULL ; +struct ifpga_rawdev *ifpga_dev; +struct ifpga_vdev_args args; +char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; +int i, n, ret =0 ; + +IFPGA_RAWDEV_PMD_INFO ("probe ifpga_rawdev_cfg %s" , vdev->device.name); + + ret =ifpga_vdev_parse_devargs (vdev->device.devargs, &args); +if (ret) +return ret; +memset (dev_name,0 ,sizeof (dev_name)); -snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"IFPGA:%s" , name); +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"IFPGA:%s" , args.bdf); rawdev =rte_rawdev_pmd_get_named_dev (dev_name);if (!rawdev) - goto end; +return -ENODEV ; ifpga_dev =ifpga_rawdev_get (rawdev);if (!ifpga_dev) - goto end; +return -ENODEV ; -memset (dev_name,0 ,sizeof (dev_name)); -snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , - port, name); +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { +if (ifpga_dev->vdev_name[i] ==NULL ) { + n =strlen (vdev->device.name) +1 ; + ifpga_dev->vdev_name[i] =rte_malloc (NULL , n,0 ); +if (ifpga_dev->vdev_name[i] ==NULL ) +return -ENOMEM ; +strlcpy (ifpga_dev->vdev_name[i], vdev->device.name, n); +break ; + } + } + +if (i >=IFPGA_MAX_VDEV ) { +IFPGA_RAWDEV_PMD_ERR ("Can't create more virtual device!" ); +return -ENOENT ; + } +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , + args.port, args.bdf); ret =rte_eal_hotplug_add (RTE_STR (IFPGA_BUS_NAME ), - dev_name, devargs->args); -end: -rte_kvargs_free (kvlist); -free (name); + dev_name, vdev->device.devargs->args); +if (ret) { +rte_free (ifpga_dev->vdev_name[i]); + ifpga_dev->vdev_name[i] =NULL ; + }return ret; }
@@ -1787,10 +1842,21 @@ static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,static int ifpga_cfg_remove (struct rte_vdev_device *vdev) { -IFPGA_RAWDEV_PMD_INFO ("Remove ifpga_cfg %p" , - vdev); +struct ifpga_vdev_args args; +char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; +int ret =0 ; -return 0 ; +IFPGA_RAWDEV_PMD_INFO ("remove ifpga_rawdev_cfg %s" , vdev->device.name); + + ret =ifpga_vdev_parse_devargs (vdev->device.devargs, &args); +if (ret) +return ret; + +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , + args.port, args.bdf); + ret =rte_eal_hotplug_remove (RTE_STR (IFPGA_BUS_NAME ), dev_name); + +return ret; }static struct rte_vdev_driver ifpga_cfg_driver = {
drivers/raw/ifpga/ifpga_rawdev.h +8 -0
@@ -50,6 +50,7 @@ enum ifpga_rawdev_device_state {#define IFPGA_RAWDEV_MSIX_IRQ_NUM 7#define IFPGA_RAWDEV_NUM 32 +#define IFPGA_MAX_VDEV 4#define IFPGA_MAX_IRQ 12struct ifpga_rawdev {
@@ -64,6 +65,13 @@ struct ifpga_rawdev {void *intr_handle[IFPGA_MAX_IRQ ];/* enable monitor thread poll device's sensors or not */ int poll_enabled; +/* name of virtual devices created on raw device */ +char *vdev_name[IFPGA_MAX_VDEV ]; +}; + +struct ifpga_vdev_args { +char bdf[8 ]; +int port; }; struct ifpga_rawdev *
Signature · 1 line
1.8.3.1
PATCH v3 1/1 raw/ifpga: remove vdev when ifpga is closed
Virtual devices created on ifpga raw device are not removed when ifpga is closed. To avoid such problem, ifpga virtual device remove function is implemented, virtual device is removed in raw device close function.
---
v2: cleanup vdev_name no matter rte_vdev_uninit succeed or not
---
v3: cleanup vdev_name in ifpga_cfg_remove
--- drivers/raw/ifpga/ifpga_rawdev.c | 166 ++++++++++++++++++++++++++++++--------- drivers/raw/ifpga/ifpga_rawdev.h | 8 ++ 2 files changed, 138 insertions(+), 36 deletions(-)
drivers/raw/ifpga/ifpga_rawdev.c +130 -36
@@ -134,6 +134,8 @@ struct ifpga_rawdev *for (i =0 ; i <IFPGA_MAX_IRQ ; i++) dev->intr_handle[i] =NULL ; dev->poll_enabled =0 ; +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) + dev->vdev_name[i] =NULL ;return dev; }
@@ -736,10 +738,22 @@ static int set_surprise_link_check_aer(static int ifpga_rawdev_close (struct rte_rawdev *dev) { +struct ifpga_rawdev *ifpga_rdev =NULL ;struct opae_adapter *adapter; +char *vdev_name =NULL ; +int i =0 ;if (dev) { -ifpga_monitor_stop_func (ifpga_rawdev_get (dev)); + ifpga_rdev =ifpga_rawdev_get (dev); +if (ifpga_rdev) { +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { + vdev_name = ifpga_rdev->vdev_name[i]; +if (vdev_name) +rte_vdev_uninit (vdev_name); + } +ifpga_monitor_stop_func (ifpga_rdev); + ifpga_rdev->rawdev =NULL ; + } adapter =ifpga_rawdev_get_priv (dev);if (adapter) {opae_adapter_destroy (adapter);
@@ -1638,8 +1652,6 @@ static int fme_clean_fme_error(struct opae_manager *mgr)return -EINVAL ; } dev =ifpga_rawdev_get (rawdev); -if (dev) - dev->rawdev =NULL ; adapter =ifpga_rawdev_get_priv (rawdev);if (!adapter)
@@ -1714,73 +1726,118 @@ static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,return 0 ; } +static int -ifpga_cfg_probe (struct rte_vdev_device *dev) +ifpga_vdev_parse_devargs (struct rte_devargs *devargs, +struct ifpga_vdev_args *args) { -struct rte_devargs *devargs; -struct rte_kvargs *kvlist =NULL ; -struct rte_rawdev *rawdev =NULL ; -struct ifpga_rawdev *ifpga_dev; -int port; +struct rte_kvargs *kvlist;char *name =NULL ; -char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; -int ret =-1 ; +int port =0 ; +int ret = -EINVAL ; - devargs = dev->device.devargs; +if (!devargs || !args) +return ret; kvlist =rte_kvargs_parse (devargs->args, valid_args);if (!kvlist) { -IFPGA_RAWDEV_PMD_LOG (ERR ,"error when parsing param" ); - goto end; +IFPGA_RAWDEV_PMD_ERR ("error when parsing devargs" ); +return ret; }if (rte_kvargs_count (kvlist,IFPGA_ARG_NAME ) ==1 ) {if (rte_kvargs_process (kvlist,IFPGA_ARG_NAME , - &ifpga_rawdev_get_string_arg, - &name) <0 ) { + &ifpga_rawdev_get_string_arg, &name) <0 ) {IFPGA_RAWDEV_PMD_ERR ("error to parse %s" , -IFPGA_ARG_NAME ); +IFPGA_ARG_NAME ); goto end; + }else { +strlcpy (args->bdf, name,sizeof (args->bdf)); +rte_free (name); } }else {IFPGA_RAWDEV_PMD_ERR ("arg %s is mandatory for ifpga bus" , -IFPGA_ARG_NAME ); +IFPGA_ARG_NAME ); goto end; }if (rte_kvargs_count (kvlist,IFPGA_ARG_PORT ) ==1 ) { -if (rte_kvargs_process (kvlist, -IFPGA_ARG_PORT , - &rte_ifpga_get_integer32_arg, - &port) <0 ) { +if (rte_kvargs_process (kvlist,IFPGA_ARG_PORT , + &rte_ifpga_get_integer32_arg, &port) <0 ) {IFPGA_RAWDEV_PMD_ERR ("error to parse %s" ,IFPGA_ARG_PORT ); goto end; + }else { + args->port = port; } }else {IFPGA_RAWDEV_PMD_ERR ("arg %s is mandatory for ifpga bus" , -IFPGA_ARG_PORT ); +IFPGA_ARG_PORT ); goto end; } + ret =0 ; + +end: +if (kvlist) +rte_kvargs_free (kvlist); + +return ret; +} + +static int +ifpga_cfg_probe (struct rte_vdev_device *vdev) +{ +struct rte_rawdev *rawdev =NULL ; +struct ifpga_rawdev *ifpga_dev; +struct ifpga_vdev_args args; +char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; +const char *vdev_name =NULL ; +int i, n, ret =0 ; + + vdev_name =rte_vdev_device_name (vdev); +if (!vdev_name) +return -EINVAL ; + +IFPGA_RAWDEV_PMD_INFO ("probe ifpga virtual device %s" , vdev_name); + + ret =ifpga_vdev_parse_devargs (vdev->device.devargs, &args); +if (ret) +return ret; +memset (dev_name,0 ,sizeof (dev_name)); -snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"IFPGA:%s" , name); +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"IFPGA:%s" , args.bdf); rawdev =rte_rawdev_pmd_get_named_dev (dev_name);if (!rawdev) - goto end; +return -ENODEV ; ifpga_dev =ifpga_rawdev_get (rawdev);if (!ifpga_dev) - goto end; +return -ENODEV ; -memset (dev_name,0 ,sizeof (dev_name)); -snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , - port, name); +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { +if (ifpga_dev->vdev_name[i] ==NULL ) { + n =strlen (vdev_name) +1 ; + ifpga_dev->vdev_name[i] =rte_malloc (NULL , n,0 ); +if (ifpga_dev->vdev_name[i] ==NULL ) +return -ENOMEM ; +strlcpy (ifpga_dev->vdev_name[i], vdev_name, n); +break ; + } + } +if (i >=IFPGA_MAX_VDEV ) { +IFPGA_RAWDEV_PMD_ERR ("Can't create more virtual device!" ); +return -ENOENT ; + } + +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , + args.port, args.bdf); ret =rte_eal_hotplug_add (RTE_STR (IFPGA_BUS_NAME ), - dev_name, devargs->args); -end: -rte_kvargs_free (kvlist); -free (name); + dev_name, vdev->device.devargs->args); +if (ret) { +rte_free (ifpga_dev->vdev_name[i]); + ifpga_dev->vdev_name[i] =NULL ; + }return ret; }
@@ -1788,10 +1845,47 @@ static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,static int ifpga_cfg_remove (struct rte_vdev_device *vdev) { -IFPGA_RAWDEV_PMD_INFO ("Remove ifpga_cfg %p" , - vdev); +struct rte_rawdev *rawdev =NULL ; +struct ifpga_rawdev *ifpga_dev; +struct ifpga_vdev_args args; +char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; +const char *vdev_name =NULL ; +char *tmp_vdev =NULL ; +int i, ret =0 ; -return 0 ; + vdev_name =rte_vdev_device_name (vdev); +if (!vdev_name) +return -EINVAL ; + +IFPGA_RAWDEV_PMD_INFO ("remove ifpga virtual device %s" , vdev_name); + + ret =ifpga_vdev_parse_devargs (vdev->device.devargs, &args); +if (ret) +return ret; + +memset (dev_name,0 ,sizeof (dev_name)); +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"IFPGA:%s" , args.bdf); + rawdev =rte_rawdev_pmd_get_named_dev (dev_name); +if (!rawdev) +return -ENODEV ; + ifpga_dev =ifpga_rawdev_get (rawdev); +if (!ifpga_dev) +return -ENODEV ; + +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , + args.port, args.bdf); + ret =rte_eal_hotplug_remove (RTE_STR (IFPGA_BUS_NAME ), dev_name); + +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { + tmp_vdev = ifpga_dev->vdev_name[i]; +if (tmp_vdev && !strcmp (tmp_vdev, vdev_name)) { +free (tmp_vdev); + ifpga_dev->vdev_name[i] =NULL ; +break ; + } + } + +return ret; }static struct rte_vdev_driver ifpga_cfg_driver = {
drivers/raw/ifpga/ifpga_rawdev.h +8 -0
@@ -50,6 +50,7 @@ enum ifpga_rawdev_device_state {#define IFPGA_RAWDEV_MSIX_IRQ_NUM 7#define IFPGA_RAWDEV_NUM 32 +#define IFPGA_MAX_VDEV 4#define IFPGA_MAX_IRQ 12struct ifpga_rawdev {
@@ -64,6 +65,13 @@ struct ifpga_rawdev {void *intr_handle[IFPGA_MAX_IRQ ];/* enable monitor thread poll device's sensors or not */ int poll_enabled; +/* name of virtual devices created on raw device */ +char *vdev_name[IFPGA_MAX_VDEV ]; +}; + +struct ifpga_vdev_args { +char bdf[8 ]; +int port; }; struct ifpga_rawdev *
Signature · 1 line
1.8.3.1
Hi Thomas,
Would you please check this patch is acceptable ?
Quoted 310 lines
-----Original Message-----
From: Huang, Wei <[email protected]>
Sent: Friday, March 18, 2022 16:58
To: [email protected]; [email protected]; Xu, Rosen <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; Zhang, Tianfei <[email protected]>; Zhang, Qi Z <[email protected]>; Yigit, Ferruh <[email protected]>; Huang, Wei <[email protected]>
Subject: [PATCH v3] raw/ifpga: remove vdev when ifpga is closedVirtual devices created on ifpga raw device are not removed when ifpga is closed. To avoid such problem, ifpga virtual device remove function is implemented, virtual device is removed in raw device close function.
Signed-off-by Wei Huang <[email protected]>Acked-by Tianfei Zhang <[email protected]>Acked-by Rosen Xu <[email protected]>---
v2: cleanupvdev_nameno matterrte_vdev_uninitsucceed or not
---
v3: cleanupvdev_nameinifpga_cfg_remove--- drivers/raw/ifpga/ifpga_rawdev.c | 166 ++++++++++++++++++++++++++++++--------- drivers/raw/ifpga/ifpga_rawdev.h | 8 ++ 2 files changed, 138 insertions(+), 36 deletions(-)drivers/raw/ifpga/ifpga_rawdev.c +15
-3@@ -134,6 +134,8 @@ struct ifpga_rawdev *for (i =0 ; i <IFPGA_MAX_IRQ ; i++) dev->intr_handle[i] =NULL ; dev->poll_enabled =0 ; +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) + dev->vdev_name[i] =NULL ;return dev; }@@ -736,10 +738,22 @@ static int set_surprise_link_check_aer( static int ifpga_rawdev_close(struct rte_rawdev *dev) { +struct ifpga_rawdev *ifpga_rdev =NULL ;struct opae_adapter *adapter; +char *vdev_name =NULL ; +int i =0 ;if (dev) { -ifpga_monitor_stop_func (ifpga_rawdev_get (dev)); + ifpga_rdev =ifpga_rawdev_get (dev); +if (ifpga_rdev) { +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { + vdev_name = ifpga_rdev->vdev_name[i]; +if (vdev_name) +rte_vdev_uninit (vdev_name); + } +ifpga_monitor_stop_func (ifpga_rdev); + ifpga_rdev->rawdev =NULL ; + } adapter =ifpga_rawdev_get_priv (dev);if (adapter) {opae_adapter_destroy (adapter);@@ -1638,8 +1652,6 @@ static int fme_clean_fme_error(struct opae_manager *mgr)return -EINVAL ; } dev =ifpga_rawdev_get (rawdev); -if (dev) - dev->rawdev =NULL ; adapter =ifpga_rawdev_get_priv (rawdev);drivers/raw/ifpga/ifpga_rawdev.c +74
-30if (!adapter)@@ -1714,73 +1726,118 @@ static int ifpga_rawdev_get_string_arg(const char *key __rte_unused, return 0; } +static int -ifpga_cfg_probe (struct rte_vdev_device *dev) +ifpga_vdev_parse_devargs (struct rte_devargs *devargs, +struct ifpga_vdev_args *args) { -struct rte_devargs *devargs; -struct rte_kvargs *kvlist =NULL ; -struct rte_rawdev *rawdev =NULL ; -struct ifpga_rawdev *ifpga_dev; -int port; +struct rte_kvargs *kvlist;char *name =NULL ; -char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; -int ret =-1 ; +int port =0 ; +int ret = -EINVAL ; - devargs = dev->device.devargs; +if (!devargs || !args) +return ret; kvlist =rte_kvargs_parse (devargs->args, valid_args);if (!kvlist) { -IFPGA_RAWDEV_PMD_LOG (ERR ,"error when parsing param"); - goto end; +IFPGA_RAWDEV_PMD_ERR ("error when parsing devargs" ); +return ret; }if (rte_kvargs_count (kvlist,IFPGA_ARG_NAME ) ==1 ) {if (rte_kvargs_process (kvlist,IFPGA_ARG_NAME , - &ifpga_rawdev_get_string_arg, - &name) <0 ) { + &ifpga_rawdev_get_string_arg, &name) <0 ) {IFPGA_RAWDEV_PMD_ERR ("error to parse %s" , -IFPGA_ARG_NAME ); +IFPGA_ARG_NAME ); goto end; + }else { +strlcpy (args->bdf, name,sizeof (args->bdf)); +rte_free (name); } }else {IFPGA_RAWDEV_PMD_ERR ("arg %s is mandatory for ifpga bus", -IFPGA_ARG_NAME ); +IFPGA_ARG_NAME ); goto end; }if (rte_kvargs_count (kvlist,IFPGA_ARG_PORT ) ==1 ) { -if (rte_kvargs_process (kvlist, -IFPGA_ARG_PORT , - &rte_ifpga_get_integer32_arg, - &port) <0 ) { +if (rte_kvargs_process (kvlist,IFPGA_ARG_PORT , + &rte_ifpga_get_integer32_arg, &port) <0 ) {IFPGA_RAWDEV_PMD_ERR ("error to parse %s" ,IFPGA_ARG_PORT ); goto end; + }else { + args->port = port; } }else {IFPGA_RAWDEV_PMD_ERR ("arg %s is mandatory for ifpga bus", -IFPGA_ARG_PORT ); +IFPGA_ARG_PORT ); goto end; } + ret =0 ; + +end: +if (kvlist) +rte_kvargs_free (kvlist); + +return ret; +} + +static int +ifpga_cfg_probe (struct rte_vdev_device *vdev) { +struct rte_rawdev *rawdev =NULL ; +struct ifpga_rawdev *ifpga_dev; +struct ifpga_vdev_args args; +char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; +const char *vdev_name =NULL ; +int i, n, ret =0 ; + + vdev_name =rte_vdev_device_name (vdev); +if (!vdev_name) +return -EINVAL ; + +IFPGA_RAWDEV_PMD_INFO ("probe ifpga virtual device %s" , vdev_name); + + ret =ifpga_vdev_parse_devargs (vdev->device.devargs, &args); +if (ret) +return ret; +memset (dev_name,0 ,sizeof (dev_name)); -snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"IFPGA:%s" , name); +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"IFPGA:%s" , args.bdf); rawdev =rte_rawdev_pmd_get_named_dev (dev_name);if (!rawdev) - goto end; +return -ENODEV ; ifpga_dev =ifpga_rawdev_get (rawdev);if (!ifpga_dev) - goto end; +return -ENODEV ; -memset (dev_name,0 ,sizeof (dev_name)); -snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , - port, name); +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { +if (ifpga_dev->vdev_name[i] ==NULL ) { + n =strlen (vdev_name) +1 ; + ifpga_dev->vdev_name[i] =rte_malloc (NULL , n,0 ); +if (ifpga_dev->vdev_name[i] ==NULL ) +return -ENOMEM ; +strlcpy (ifpga_dev->vdev_name[i], vdev_name, n); +break ; + } + } +if (i >=IFPGA_MAX_VDEV ) { +IFPGA_RAWDEV_PMD_ERR ("Can't create more virtual device!"); +return -ENOENT ; + } + +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , + args.port, args.bdf); ret =rte_eal_hotplug_add (RTE_STR (IFPGA_BUS_NAME ), - dev_name, devargs->args); -end: -rte_kvargs_free (kvlist); -free (name); + dev_name, vdev->device.devargs->args); +if (ret) { +rte_free (ifpga_dev->vdev_name[i]); + ifpga_dev->vdev_name[i] =NULL ; + }return ret; }@@ -1788,10 +1845,47 @@ static int ifpga_rawdev_get_string_arg(constchar *key
__rte_unused, static intifpga_cfg_remove(struct rte_vdev_device *vdev){drivers/raw/ifpga/ifpga_rawdev.c +12
-3-IFPGA_RAWDEV_PMD_INFO ("Remove ifpga_cfg %p" , - vdev); +struct rte_rawdev *rawdev =NULL ; +struct ifpga_rawdev *ifpga_dev; +struct ifpga_vdev_args args; +char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; +const char *vdev_name =NULL ; +char *tmp_vdev =NULL ; +int i, ret =0 ; -return 0 ; + vdev_name =rte_vdev_device_name (vdev); +if (!vdev_name) +return -EINVAL ; + + IFPGA_RAWDEV_PMD_INFO("remove ifpga virtual device %s",
vdev_name);drivers/raw/ifpga/ifpga_rawdev.c +7
-0+ + ret =ifpga_vdev_parse_devargs (vdev->device.devargs, &args); +if (ret) +return ret; + +memset (dev_name,0 ,sizeof (dev_name)); + snprintf(dev_name, RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%s",args.bdf);
drivers/raw/ifpga/ifpga_rawdev.c +10
-0+ rawdev =rte_rawdev_pmd_get_named_dev (dev_name); +if (!rawdev) +return -ENODEV ; + ifpga_dev =ifpga_rawdev_get (rawdev); +if (!ifpga_dev) +return -ENODEV ; + +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , + args.port, args.bdf); + ret = rte_eal_hotplug_remove(RTE_STR(IFPGA_BUS_NAME),
dev_name);drivers/raw/ifpga/ifpga_rawdev.c +11
-0+ +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { + tmp_vdev = ifpga_dev->vdev_name[i]; +if (tmp_vdev && !strcmp (tmp_vdev, vdev_name)) { +free (tmp_vdev); + ifpga_dev->vdev_name[i] =NULL ; +break ; + } + } + +return ret; } static struct rte_vdev_driver ifpga_cfg_driver = { diff --git
a/drivers/raw/ifpga/ifpga_rawdev.hb/drivers/raw/ifpga/ifpga_rawdev.hindex 857b734..eb9a9a5 100644drivers/raw/ifpga/ifpga_rawdev.h +8
-1@@ -50,6 +50,7 @@ enum ifpga_rawdev_device_state {#define IFPGA_RAWDEV_MSIX_IRQ_NUM 7#define IFPGA_RAWDEV_NUM 32 +#define IFPGA_MAX_VDEV 4#define IFPGA_MAX_IRQ 12struct ifpga_rawdev {@@ -64,6 +65,13 @@ struct ifpga_rawdev {void *intr_handle[IFPGA_MAX_IRQ ];/* enable monitor thread poll device's sensors or not */ int poll_enabled; +/* name of virtual devices created on raw device */ +char *vdev_name[IFPGA_MAX_VDEV ]; +}; + +struct ifpga_vdev_args { +char bdf[8 ]; +int port; }; struct ifpga_rawdev * --1.8.3.1
Quoted 10 lines
-----Original Message-----
From: Huang, Wei <[email protected]>
Sent: Tuesday, March 29, 2022 9:56 AM
To: [email protected]; [email protected]; Xu, Rosen <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; Zhang, Tianfei <[email protected]>; Zhang, Qi Z <[email protected]>; Yigit, Ferruh <[email protected]>
Subject: RE: [PATCH v3] raw/ifpga: remove vdev when ifpga is closed
Quoted 3 lines
Hi Thomas,
Would you please check this patch is acceptable ?
Hi Wei:
22.07 cycle just begins, It may not necessary to push PMD merge quite early 😊 Below is the roadmap for your reference
Proposal deadline (RFC/v1 patches): 10 April 2022 API freeze (-rc1): 30 May 2022
PMD features freeze (-rc2): 20 June 2022
Builtin applications features freeze (-rc3): 27 June 2022
Release: 13 July 2022
Regards
Qi
Quoted 313 lines
Quoted 5 lines
-----Original Message-----
From: Huang, Wei <[email protected]>
Sent: Friday, March 18, 2022 16:58
To: [email protected]; [email protected]; Xu, RosenQuoted 110 lines
[email protected]; [email protected]
Cc: [email protected]; Zhang, Tianfei <[email protected]>; Zhang, Qi Z <[email protected]>; Yigit, Ferruh <[email protected]>; Huang, Wei <[email protected]>
Subject: [PATCH v3] raw/ifpga: remove vdev when ifpga is closedVirtual devices created on ifpga raw device are not removed when ifpga is closed. To avoid such problem, ifpga virtual device remove function is implemented, virtual device is removed in raw device close function.
Signed-off-by Wei Huang <[email protected]>Acked-by Tianfei Zhang <[email protected]>Acked-by Rosen Xu <[email protected]>---
v2: cleanupvdev_nameno matterrte_vdev_uninitsucceed or not
---
v3: cleanupvdev_nameinifpga_cfg_remove--- drivers/raw/ifpga/ifpga_rawdev.c | 166 ++++++++++++++++++++++++++++++--------- drivers/raw/ifpga/ifpga_rawdev.h | 8 ++ 2 files changed, 138 insertions(+), 36 deletions(-)drivers/raw/ifpga/ifpga_rawdev.c +15
-3@@ -134,6 +134,8 @@ struct ifpga_rawdev *for (i =0 ; i <IFPGA_MAX_IRQ ; i++) dev->intr_handle[i] =NULL ; dev->poll_enabled =0 ; +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) + dev->vdev_name[i] =NULL ;return dev; }@@ -736,10 +738,22 @@ static int set_surprise_link_check_aer( staticint ifpga_rawdev_close (struct rte_rawdev *dev) { +struct ifpga_rawdev *ifpga_rdev =NULL ;struct opae_adapter *adapter; +char *vdev_name =NULL ; +int i =0 ;if (dev) { -ifpga_monitor_stop_func (ifpga_rawdev_get (dev)); + ifpga_rdev =ifpga_rawdev_get (dev); +if (ifpga_rdev) { +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { + vdev_name = ifpga_rdev->vdev_name[i]; +if (vdev_name) +rte_vdev_uninit (vdev_name); + } +ifpga_monitor_stop_func (ifpga_rdev); + ifpga_rdev->rawdev =NULL ; + } adapter =ifpga_rawdev_get_priv (dev);if (adapter) {opae_adapter_destroy (adapter);@@ -1638,8 +1652,6 @@ static int fme_clean_fme_error(struct opae_manager *mgr)return -EINVAL ; } dev =ifpga_rawdev_get (rawdev); -if (dev) - dev->rawdev =NULL ; adapter =ifpga_rawdev_get_priv (rawdev);drivers/raw/ifpga/ifpga_rawdev.c +11
-13if (!adapter)@@ -1714,73 +1726,118 @@ static int ifpga_rawdev_get_string_arg(const char *key __rte_unused, return 0; } +static int -ifpga_cfg_probe (struct rte_vdev_device *dev) +ifpga_vdev_parse_devargs (struct rte_devargs *devargs, +struct ifpga_vdev_args *args) { -struct rte_devargs *devargs; -struct rte_kvargs *kvlist =NULL ; -struct rte_rawdev *rawdev =NULL ; -struct ifpga_rawdev *ifpga_dev; -int port; +struct rte_kvargs *kvlist;char *name =NULL ; -char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; -int ret =-1 ; +int port =0 ; +int ret = -EINVAL ; - devargs = dev->device.devargs; +if (!devargs || !args) +return ret; kvlist =rte_kvargs_parse (devargs->args, valid_args);if (!kvlist) { -IFPGA_RAWDEV_PMD_LOG (ERR ,"error when parsing param"); - goto end; +IFPGA_RAWDEV_PMD_ERR ("error when parsing devargs" ); +return ret; }if (rte_kvargs_count (kvlist,IFPGA_ARG_NAME ) ==1 ) {if (rte_kvargs_process (kvlist,IFPGA_ARG_NAME , - &ifpga_rawdev_get_string_arg, - &name) <0 ) { + &ifpga_rawdev_get_string_arg, &name) <0 ) {drivers/raw/ifpga/ifpga_rawdev.c static int ifpga_rawdev_get_string_arg(const · line 1761
Quoted 10 lines
drivers/raw/ifpga/ifpga_rawdev.c +4
-1IFPGA_RAWDEV_PMD_ERR ("error to parse %s" , -IFPGA_ARG_NAME ); +IFPGA_ARG_NAME ); goto end; + }else { +strlcpy (args->bdf, name,sizeof (args->bdf)); +rte_free (name); } }else { IFPGA_RAWDEV_PMD_ERR("arg %s is mandatory for ifpgabus",
Quoted 10 lines
drivers/raw/ifpga/ifpga_rawdev.c +1
-5- IFPGA_ARG_NAME); + IFPGA_ARG_NAME); goto end; }if (rte_kvargs_count (kvlist,IFPGA_ARG_PORT ) ==1 ) { -if (rte_kvargs_process (kvlist, -IFPGA_ARG_PORT , - &rte_ifpga_get_integer32_arg, - &port) <0 ) {drivers/raw/ifpga/ifpga_rawdev.c static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,
Quoted 10 lines
drivers/raw/ifpga/ifpga_rawdev.c +4
-0+if (rte_kvargs_process (kvlist,IFPGA_ARG_PORT , + &rte_ifpga_get_integer32_arg, &port) <0 ) {IFPGA_RAWDEV_PMD_ERR ("error to parse %s" ,IFPGA_ARG_PORT ); goto end; + }else { + args->port = port; } }else { IFPGA_RAWDEV_PMD_ERR("arg %s is mandatory for ifpgabus",
Quoted 164 lines
drivers/raw/ifpga/ifpga_rawdev.c +54
-11- IFPGA_ARG_PORT); + IFPGA_ARG_PORT); goto end; } + ret =0 ; + +end: +if (kvlist) +rte_kvargs_free (kvlist); + +return ret; +} + +static int +ifpga_cfg_probe (struct rte_vdev_device *vdev) { +struct rte_rawdev *rawdev =NULL ; +struct ifpga_rawdev *ifpga_dev; +struct ifpga_vdev_args args; +char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; +const char *vdev_name =NULL ; +int i, n, ret =0 ; + + vdev_name =rte_vdev_device_name (vdev); +if (!vdev_name) +return -EINVAL ; + +IFPGA_RAWDEV_PMD_INFO ("probe ifpga virtual device %s" , vdev_name); + + ret =ifpga_vdev_parse_devargs (vdev->device.devargs, &args); +if (ret) +return ret; +memset (dev_name,0 ,sizeof (dev_name)); -snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"IFPGA:%s" , name); +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"IFPGA:%s" , args.bdf); rawdev =rte_rawdev_pmd_get_named_dev (dev_name);if (!rawdev) - goto end; +return -ENODEV ; ifpga_dev =ifpga_rawdev_get (rawdev);if (!ifpga_dev) - goto end; +return -ENODEV ; -memset (dev_name,0 ,sizeof (dev_name)); -snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , - port, name); +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { +if (ifpga_dev->vdev_name[i] ==NULL ) { + n =strlen (vdev_name) +1 ; + ifpga_dev->vdev_name[i] =rte_malloc (NULL , n,0 ); +if (ifpga_dev->vdev_name[i] ==NULL ) +return -ENOMEM ; +strlcpy (ifpga_dev->vdev_name[i], vdev_name, n); +break ; + } + } +if (i >=IFPGA_MAX_VDEV ) { +IFPGA_RAWDEV_PMD_ERR ("Can't create more virtual device!"); +return -ENOENT ; + } + +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , + args.port, args.bdf); ret =rte_eal_hotplug_add (RTE_STR (IFPGA_BUS_NAME ), - dev_name, devargs->args); -end: -rte_kvargs_free (kvlist); -free (name); + dev_name, vdev->device.devargs->args); +if (ret) { +rte_free (ifpga_dev->vdev_name[i]); + ifpga_dev->vdev_name[i] =NULL ; + }return ret; }@@ -1788,10 +1845,47 @@ static int ifpga_rawdev_get_string_arg(constchar *key
__rte_unused, static intifpga_cfg_remove(struct rte_vdev_device *vdev){drivers/raw/ifpga/ifpga_rawdev.c +12
-3-IFPGA_RAWDEV_PMD_INFO ("Remove ifpga_cfg %p" , - vdev); +struct rte_rawdev *rawdev =NULL ; +struct ifpga_rawdev *ifpga_dev; +struct ifpga_vdev_args args; +char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; +const char *vdev_name =NULL ; +char *tmp_vdev =NULL ; +int i, ret =0 ; -return 0 ; + vdev_name =rte_vdev_device_name (vdev); +if (!vdev_name) +return -EINVAL ; + + IFPGA_RAWDEV_PMD_INFO("remove ifpga virtual device %s",
vdev_name);drivers/raw/ifpga/ifpga_rawdev.c +7
-0+ + ret =ifpga_vdev_parse_devargs (vdev->device.devargs, &args); +if (ret) +return ret; + +memset (dev_name,0 ,sizeof (dev_name)); + snprintf(dev_name, RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%s",args.bdf);
drivers/raw/ifpga/ifpga_rawdev.c +10
-0+ rawdev =rte_rawdev_pmd_get_named_dev (dev_name); +if (!rawdev) +return -ENODEV ; + ifpga_dev =ifpga_rawdev_get (rawdev); +if (!ifpga_dev) +return -ENODEV ; + +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , + args.port, args.bdf); + ret = rte_eal_hotplug_remove(RTE_STR(IFPGA_BUS_NAME),
dev_name);drivers/raw/ifpga/ifpga_rawdev.c +11
-0+ +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { + tmp_vdev = ifpga_dev->vdev_name[i]; +if (tmp_vdev && !strcmp (tmp_vdev, vdev_name)) { +free (tmp_vdev); + ifpga_dev->vdev_name[i] =NULL ; +break ; + } + } + +return ret; } static struct rte_vdev_driver ifpga_cfg_driver = { diff --git
a/drivers/raw/ifpga/ifpga_rawdev.hb/drivers/raw/ifpga/ifpga_rawdev.hindex 857b734..eb9a9a5 100644drivers/raw/ifpga/ifpga_rawdev.h +8
-1@@ -50,6 +50,7 @@ enum ifpga_rawdev_device_state {#define IFPGA_RAWDEV_MSIX_IRQ_NUM 7#define IFPGA_RAWDEV_NUM 32 +#define IFPGA_MAX_VDEV 4#define IFPGA_MAX_IRQ 12struct ifpga_rawdev {@@ -64,6 +65,13 @@ struct ifpga_rawdev {void *intr_handle[IFPGA_MAX_IRQ ];/* enable monitor thread poll device's sensors or not */ int poll_enabled; +/* name of virtual devices created on raw device */ +char *vdev_name[IFPGA_MAX_VDEV ]; +}; + +struct ifpga_vdev_args { +char bdf[8 ]; +int port; }; struct ifpga_rawdev * --1.8.3.1
Got it, thanks.
Quoted 319 lines
-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: Tuesday, March 29, 2022 10:15
To: Huang, Wei <[email protected]>; [email protected]; [email protected]; Xu, Rosen <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; Zhang, Tianfei <[email protected]>; Yigit, Ferruh <[email protected]>
Subject: RE: [PATCH v3] raw/ifpga: remove vdev when ifpga is closedQuoted 4 lines
-----Original Message-----
From: Huang, Wei <[email protected]>
Sent: Tuesday, March 29, 2022 9:56 AM
To: [email protected]; [email protected]; Xu, RosenQuoted 8 lines
[email protected]; [email protected]
Cc: [email protected]; Zhang, Tianfei <[email protected]>; Zhang, Qi Z <[email protected]>; Yigit, Ferruh <[email protected]>
Subject: RE: [PATCH v3] raw/ifpga: remove vdev when ifpga is closedHi Thomas,
Would you please check this patch is acceptable ?
Hi Wei:
22.07 cycle just begins, It may not necessary to push PMD merge quite early 😊
Below is the roadmap for your referenceProposal deadline (RFC/v1 patches): 10 April 2022 API freeze (-rc1): 30 May 2022 PMD features freeze (-rc2): 20 June 2022 Builtin applications features freeze (-rc3): 27 June 2022
Release: 13 July 2022Regards
QiQuoted 15 lines
Quoted 5 lines
-----Original Message-----
From: Huang, Wei <[email protected]>
Sent: Friday, March 18, 2022 16:58
To: [email protected]; [email protected]; Xu, RosenQuoted 9 lines
[email protected]; [email protected]
Cc: [email protected]; Zhang, Tianfei <[email protected]>; Zhang, Qi Z <[email protected]>; Yigit, Ferruh <[email protected]>; Huang, Wei <[email protected]>
Subject: [PATCH v3] raw/ifpga: remove vdev when ifpga is closedVirtual devices created on ifpga raw device are not removed when ifpga is closed. To avoid such problem, ifpga virtual device remove function is implemented, virtual device is removed in raw device close
function.
Quoted 72 lines
Quoted 72 lines
Signed-off-by Wei Huang <[email protected]>Acked-by Tianfei Zhang <[email protected]>Acked-by Rosen Xu <[email protected]>---
v2: cleanupvdev_nameno matterrte_vdev_uninitsucceed or not
---
v3: cleanupvdev_nameinifpga_cfg_remove--- drivers/raw/ifpga/ifpga_rawdev.c | 166 ++++++++++++++++++++++++++++++--------- drivers/raw/ifpga/ifpga_rawdev.h | 8 ++ 2 files changed, 138 insertions(+), 36 deletions(-)drivers/raw/ifpga/ifpga_rawdev.c +0
-0@@ -134,6 +134,8 @@ struct ifpga_rawdev * for (i = 0; i <
IFPGA_MAX_IRQ; i++) dev->intr_handle[i] = NULL;dev->poll_enabled= 0;drivers/raw/ifpga/ifpga_rawdev.c +11
-1+for (i =0 ; i <IFPGA_MAX_VDEV ; i++) +dev->vdev_name[i] =NULL ;return dev; }@@ -736,10 +738,22 @@ static int set_surprise_link_check_aer(static int ifpga_rawdev_close (struct rte_rawdev *dev) { +struct ifpga_rawdev *ifpga_rdev =NULL ;struct opae_adapter *adapter; +char *vdev_name =NULL ; +int i =0 ;if (dev) { -ifpga_monitor_stop_func (ifpga_rawdev_get (dev)); +ifpga_rdev =ifpga_rawdev_get (dev);if (ifpga_rdev) {for (i =0 ; i +<IFPGA_MAX_VDEV ; i++) { vdev_name = ifpga_rdev->vdev_name[i];if +(vdev_name)rte_vdev_uninit (vdev_name); } +ifpga_monitor_stop_func (ifpga_rdev); +ifpga_rdev->rawdev =NULL ; +} adapter =ifpga_rawdev_get_priv (dev);if (adapter) {
opae_adapter_destroy(adapter); @@ -1638,8 +1652,6 @@ static intfme_clean_fme_error(struct opae_manager *mgr)return-EINVAL; } dev =ifpga_rawdev_get(rawdev); -if (dev)
-dev->rawdev = NULL;adapter =
ifpga_rawdev_get_priv(rawdev); if (!adapter) @@ -1714,73
+1726,118 @@ static int ifpga_rawdev_get_string_arg(const char *key__rte_unused,return 0;
}drivers/raw/ifpga/ifpga_rawdev.c +6
-8+static int -ifpga_cfg_probe (struct rte_vdev_device *dev) +ifpga_vdev_parse_devargs (struct rte_devargs *devargs,struct +ifpga_vdev_args *args) { -struct rte_devargs *devargs; -struct rte_kvargs *kvlist =NULL ; -struct rte_rawdev *rawdev =NULL ; -struct ifpga_rawdev *ifpga_dev; -int port; +struct rte_kvargs *kvlist;char *name =NULL ; -char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; -int ret =-1 ; +int port =0 ; +int ret = -EINVAL ;Quoted 6 lines
Quoted 6 lines
drivers/raw/ifpga/ifpga_rawdev.c +2
-1-devargs = dev->device.devargs; +if (!devargs || !args) +return ret; kvlist =rte_kvargs_parse (devargs->args, valid_args);if (!kvlist){ -IFPGA_RAWDEV_PMD_LOG(ERR, "error when parsing param"); -goto
end;
Quoted 23 lines
Quoted 7 lines
+IFPGA_RAWDEV_PMD_ERR("error when parsing devargs"); return ret;
}if (
rte_kvargs_count(kvlist, IFPGA_ARG_NAME)== 1) { if
(rte_kvargs_process(kvlist,IFPGA_ARG_NAME,drivers/raw/ifpga/ifpga_rawdev.c +0
-2- &ifpga_rawdev_get_string_arg, - &name) < 0) {drivers/raw/ifpga/ifpga_rawdev.c static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,
Quoted 10 lines
drivers/raw/ifpga/ifpga_rawdev.c +4
-1+&ifpga_rawdev_get_string_arg, &name) < 0) { IFPGA_RAWDEV_PMD_ERR("error to parse %s", -IFPGA_ARG_NAME ); +IFPGA_ARG_NAME); goto end; +} else { +strlcpy (args->bdf, name,sizeof (args->bdf));rte_free (name); } }else { IFPGA_RAWDEV_PMD_ERR("arg %s is mandatory for ifpgabus",
Quoted 5 lines
drivers/raw/ifpga/ifpga_rawdev.c +1
-1- IFPGA_ARG_NAME); +IFPGA_ARG_NAME); goto end; }Quoted 7 lines
Quoted 7 lines
if (
rte_kvargs_count(kvlist, IFPGA_ARG_PORT)== 1) { -if
(rte_kvargs_process(kvlist, -IFPGA_ARG_PORT, -&rte_ifpga_get_integer32_arg,
-&port) < 0) {
+if (rte_kvargs_process(kvlist, IFPGA_ARG_PORT, +&rte_ifpga_get_integer32_arg, &port)< 0) {
IFPGA_RAWDEV_PMD_ERR("error to parse %s", IFPGA_ARG_PORT);goto
Quoted 12 lines
drivers/raw/ifpga/ifpga_rawdev.c static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,
Quoted 6 lines
end;
drivers/raw/ifpga/ifpga_rawdev.c +2
-0+}else { +args->port = port; } }else { IFPGA_RAWDEV_PMD_ERR("arg %s is mandatory for ifpgabus",
Quoted 5 lines
drivers/raw/ifpga/ifpga_rawdev.c +1
-1- IFPGA_ARG_PORT); +IFPGA_ARG_PORT); goto end; }Quoted 13 lines
drivers/raw/ifpga/ifpga_rawdev.c static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,
Quoted 13 lines
drivers/raw/ifpga/ifpga_rawdev.c +13
-0+ret =0 ; + +end: +if (kvlist) +rte_kvargs_free (kvlist); + +return ret; +} + +static int +ifpga_cfg_probe (struct rte_vdev_device *vdev) {struct rte_rawdev +*rawdev =NULL ;struct ifpga_rawdev *ifpga_dev;struct +ifpga_vdev_args args;char dev_name[RTE_RAWDEV_NAME_MAX_LEN];
Quoted 30 lines
Quoted 30 lines
drivers/raw/ifpga/ifpga_rawdev.c +7
-0+const char *vdev_name =NULL ; +int i, n, ret =0 ; + +vdev_name =rte_vdev_device_name (vdev);if (!vdev_name)return +-EINVAL ; + +IFPGA_RAWDEV_PMD_INFO("probe ifpga virtual device %s",
vdev_name);drivers/raw/ifpga/ifpga_rawdev.c +4
-0+ +ret =ifpga_vdev_parse_devargs (vdev->device.devargs, &args);if +(ret)return ret; + memset(dev_name, 0, sizeof(dev_name)); -snprintf(dev_name,
RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%s", name); +snprintf(dev_name,RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%s", args.bdf);
rawdev =rte_rawdev_pmd_get_named_dev(dev_name); if (!rawdev)drivers/raw/ifpga/ifpga_rawdev.c +2
-2-goto end; +return -ENODEV ; ifpga_dev = ifpga_rawdev_get(rawdev); if (!ifpga_dev) -goto end; +return -ENODEV ; -memset(dev_name, 0, sizeof(dev_name)); -snprintf(dev_name,
RTE_RAWDEV_NAME_MAX_LEN, "%d|%s", -port, name);drivers/raw/ifpga/ifpga_rawdev.c +4
-0+for (i =0 ; i <IFPGA_MAX_VDEV ; i++) {if (ifpga_dev->vdev_name[i] +==NULL ) { n =strlen (vdev_name) +1 ; ifpga_dev->vdev_name[i] = +rte_malloc (NULL , n,0 );if (ifpga_dev->vdev_name[i] ==NULL )return +-ENOMEM ;strlcpy (ifpga_dev->vdev_name[i], vdev_name, n);break ; } }Quoted 7 lines
drivers/raw/ifpga/ifpga_rawdev.c static int ifpga_rawdev_get_string_arg(const char *key __rte_unused, · line 1833
Quoted 7 lines
drivers/raw/ifpga/ifpga_rawdev.c +2
-0+if (i >=IFPGA_MAX_VDEV ) { +IFPGA_RAWDEV_PMD_ERR("Can't create more virtualdevice!");
drivers/raw/ifpga/ifpga_rawdev.c +4
-0+return -ENOENT ; +} + +snprintf(dev_name, RTE_RAWDEV_NAME_MAX_LEN, "%d|%s",args.port,
Quoted 11 lines
Quoted 11 lines
drivers/raw/ifpga/ifpga_rawdev.c +5
-4+args.bdf); ret =rte_eal_hotplug_add (RTE_STR (IFPGA_BUS_NAME ), -dev_name, devargs->args); -end: -rte_kvargs_free (kvlist); -free (name); +dev_name, vdev->device.devargs->args);if (ret) { +rte_free (ifpga_dev->vdev_name[i]); +ifpga_dev->vdev_name[i] =NULL ; +}Quoted 5 lines
Quoted 5 lines
return ret;
}drivers/raw/ifpga/ifpga_rawdev.c +0
-0@@ -1788,10 +1845,47 @@ static int ifpga_rawdev_get_string_arg(constchar *key
__rte_unused, static intifpga_cfg_remove(struct rte_vdev_device *vdev){ -IFPGA_RAWDEV_PMD_INFO("Remove
ifpga_cfgQuoted 21 lines
Quoted 21 lines
%p", -vdev);
drivers/raw/ifpga/ifpga_rawdev.c +11
-1+struct rte_rawdev *rawdev =NULL ; +struct ifpga_rawdev *ifpga_dev; +struct ifpga_vdev_args args; +char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; +const char *vdev_name =NULL ; +char *tmp_vdev =NULL ; +int i, ret =0 ; -return 0 ; +vdev_name =rte_vdev_device_name (vdev);if (!vdev_name)return +-EINVAL ; + +IFPGA_RAWDEV_PMD_INFO("remove ifpga virtual device %s",
vdev_name);drivers/raw/ifpga/ifpga_rawdev.c +6
-0+ +ret =ifpga_vdev_parse_devargs (vdev->device.devargs, &args);if +(ret)return ret; + +memset(dev_name, 0, sizeof(dev_name)); snprintf(dev_name, +RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%s",Quoted 8 lines
drivers/raw/ifpga/ifpga_rawdev.c static int ifpga_rawdev_get_string_arg(const char *key __rte_unused, · line 1875
Quoted 8 lines
args.bdf);
drivers/raw/ifpga/ifpga_rawdev.c +7
-0+rawdev =rte_rawdev_pmd_get_named_dev (dev_name); +if (!rawdev) +return -ENODEV ; +ifpga_dev =ifpga_rawdev_get (rawdev);if (!ifpga_dev)return +-ENODEV ; + +snprintf(dev_name, RTE_RAWDEV_NAME_MAX_LEN, "%d|%s",args.port,
Quoted 41 lines
Quoted 40 lines
+args.bdf); ret =
rte_eal_hotplug_remove(RTE_STR(IFPGA_BUS_NAME), dev_name);drivers/raw/ifpga/ifpga_rawdev.c +7
-0+ +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { tmp_vdev = +ifpga_dev->vdev_name[i];if (tmp_vdev && !strcmp (tmp_vdev, +vdev_name)) {free (tmp_vdev); ifpga_dev->vdev_name[i] =NULL ; +break ; } } + +return ret; } static struct rte_vdev_driver ifpga_cfg_driver = { diff --git
a/drivers/raw/ifpga/ifpga_rawdev.hb/drivers/raw/ifpga/ifpga_rawdev.hindex 857b734..eb9a9a5 100644drivers/raw/ifpga/ifpga_rawdev.h +8
-1@@ -50,6 +50,7 @@ enum ifpga_rawdev_device_state {#define IFPGA_RAWDEV_MSIX_IRQ_NUM 7#define IFPGA_RAWDEV_NUM 32 +#define IFPGA_MAX_VDEV 4#define IFPGA_MAX_IRQ 12struct ifpga_rawdev {@@ -64,6 +65,13 @@ struct ifpga_rawdev {void *intr_handle[IFPGA_MAX_IRQ ];/* enable monitor thread poll device's sensors or not */ int poll_enabled; +/* name of virtual devices created on raw device */ +char *vdev_name[IFPGA_MAX_VDEV ]; +}; + +struct ifpga_vdev_args { +char bdf[8 ]; +int port; }; struct ifpga_rawdev * --1.8.3.1
Quoted 32 lines
-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: Tuesday, March 29, 2022 10:15
To: Huang, Wei <[email protected]>; [email protected]; [email protected]; Xu, Rosen <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; Zhang, Tianfei <[email protected]>; Yigit, Ferruh <[email protected]>
Subject: RE: [PATCH v3] raw/ifpga: remove vdev when ifpga is closedQuoted 4 lines
-----Original Message-----
From: Huang, Wei <[email protected]>
Sent: Tuesday, March 29, 2022 9:56 AM
To: [email protected]; [email protected]; Xu, RosenQuoted 8 lines
[email protected]; [email protected]
Cc: [email protected]; Zhang, Tianfei <[email protected]>; Zhang, Qi Z <[email protected]>; Yigit, Ferruh <[email protected]>
Subject: RE: [PATCH v3] raw/ifpga: remove vdev when ifpga is closedHi Thomas,
Would you please check this patch is acceptable ?
Hi Wei:
22.07 cycle just begins, It may not necessary to push PMD merge quite early 😊
Below is the roadmap for your reference
Quoted 8 lines
Proposal deadline (RFC/v1 patches): 10 April 2022 API freeze (-rc1): 30 May 2022 PMD features freeze (-rc2): 20 June 2022 Builtin applications features freeze (-rc3): 27 June 2022
Release: 13 July 2022Regards
Qi
Hi Qi and Thomas,
This patch is not new feature, it's a fix, can it be merged now ?
Quoted 279 lines
Quoted 15 lines
Quoted 5 lines
-----Original Message-----
From: Huang, Wei <[email protected]>
Sent: Friday, March 18, 2022 16:58
To: [email protected]; [email protected]; Xu, RosenQuoted 9 lines
[email protected]; [email protected]
Cc: [email protected]; Zhang, Tianfei <[email protected]>; Zhang, Qi Z <[email protected]>; Yigit, Ferruh <[email protected]>; Huang, Wei <[email protected]>
Subject: [PATCH v3] raw/ifpga: remove vdev when ifpga is closedVirtual devices created on ifpga raw device are not removed when ifpga is closed. To avoid such problem, ifpga virtual device remove function is implemented, virtual device is removed in raw device close
function.
Quoted 72 lines
Quoted 72 lines
Signed-off-by Wei Huang <[email protected]>Acked-by Tianfei Zhang <[email protected]>Acked-by Rosen Xu <[email protected]>---
v2: cleanupvdev_nameno matterrte_vdev_uninitsucceed or not
---
v3: cleanupvdev_nameinifpga_cfg_remove--- drivers/raw/ifpga/ifpga_rawdev.c | 166 ++++++++++++++++++++++++++++++--------- drivers/raw/ifpga/ifpga_rawdev.h | 8 ++ 2 files changed, 138 insertions(+), 36 deletions(-)drivers/raw/ifpga/ifpga_rawdev.c +0
-0@@ -134,6 +134,8 @@ struct ifpga_rawdev * for (i = 0; i <
IFPGA_MAX_IRQ; i++) dev->intr_handle[i] = NULL;dev->poll_enabled= 0;drivers/raw/ifpga/ifpga_rawdev.c +11
-1+for (i =0 ; i <IFPGA_MAX_VDEV ; i++) +dev->vdev_name[i] =NULL ;return dev; }@@ -736,10 +738,22 @@ static int set_surprise_link_check_aer(static int ifpga_rawdev_close (struct rte_rawdev *dev) { +struct ifpga_rawdev *ifpga_rdev =NULL ;struct opae_adapter *adapter; +char *vdev_name =NULL ; +int i =0 ;if (dev) { -ifpga_monitor_stop_func (ifpga_rawdev_get (dev)); +ifpga_rdev =ifpga_rawdev_get (dev);if (ifpga_rdev) {for (i =0 ; i +<IFPGA_MAX_VDEV ; i++) { vdev_name = ifpga_rdev->vdev_name[i];if +(vdev_name)rte_vdev_uninit (vdev_name); } +ifpga_monitor_stop_func (ifpga_rdev); +ifpga_rdev->rawdev =NULL ; +} adapter =ifpga_rawdev_get_priv (dev);if (adapter) {
opae_adapter_destroy(adapter); @@ -1638,8 +1652,6 @@ static intfme_clean_fme_error(struct opae_manager *mgr)return-EINVAL; } dev =ifpga_rawdev_get(rawdev); -if (dev)
-dev->rawdev = NULL;adapter =
ifpga_rawdev_get_priv(rawdev); if (!adapter) @@ -1714,73
+1726,118 @@ static int ifpga_rawdev_get_string_arg(const char *key__rte_unused,return 0;
}drivers/raw/ifpga/ifpga_rawdev.c +6
-8+static int -ifpga_cfg_probe (struct rte_vdev_device *dev) +ifpga_vdev_parse_devargs (struct rte_devargs *devargs,struct +ifpga_vdev_args *args) { -struct rte_devargs *devargs; -struct rte_kvargs *kvlist =NULL ; -struct rte_rawdev *rawdev =NULL ; -struct ifpga_rawdev *ifpga_dev; -int port; +struct rte_kvargs *kvlist;char *name =NULL ; -char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; -int ret =-1 ; +int port =0 ; +int ret = -EINVAL ;Quoted 6 lines
Quoted 6 lines
drivers/raw/ifpga/ifpga_rawdev.c +2
-1-devargs = dev->device.devargs; +if (!devargs || !args) +return ret; kvlist =rte_kvargs_parse (devargs->args, valid_args);if (!kvlist){ -IFPGA_RAWDEV_PMD_LOG(ERR, "error when parsing param"); -goto
end;
Quoted 23 lines
Quoted 7 lines
+IFPGA_RAWDEV_PMD_ERR("error when parsing devargs"); return ret;
}if (
rte_kvargs_count(kvlist, IFPGA_ARG_NAME)== 1) { if
(rte_kvargs_process(kvlist,IFPGA_ARG_NAME,drivers/raw/ifpga/ifpga_rawdev.c +0
-2- &ifpga_rawdev_get_string_arg, - &name) < 0) {drivers/raw/ifpga/ifpga_rawdev.c static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,
Quoted 10 lines
drivers/raw/ifpga/ifpga_rawdev.c +4
-1+&ifpga_rawdev_get_string_arg, &name) < 0) { IFPGA_RAWDEV_PMD_ERR("error to parse %s", -IFPGA_ARG_NAME ); +IFPGA_ARG_NAME); goto end; +} else { +strlcpy (args->bdf, name,sizeof (args->bdf));rte_free (name); } }else { IFPGA_RAWDEV_PMD_ERR("arg %s is mandatory for ifpgabus",
Quoted 5 lines
drivers/raw/ifpga/ifpga_rawdev.c +1
-1- IFPGA_ARG_NAME); +IFPGA_ARG_NAME); goto end; }Quoted 7 lines
Quoted 7 lines
if (
rte_kvargs_count(kvlist, IFPGA_ARG_PORT)== 1) { -if
(rte_kvargs_process(kvlist, -IFPGA_ARG_PORT, -&rte_ifpga_get_integer32_arg,
-&port) < 0) {
+if (rte_kvargs_process(kvlist, IFPGA_ARG_PORT, +&rte_ifpga_get_integer32_arg, &port)< 0) {
IFPGA_RAWDEV_PMD_ERR("error to parse %s", IFPGA_ARG_PORT);goto
Quoted 12 lines
drivers/raw/ifpga/ifpga_rawdev.c static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,
Quoted 6 lines
end;
drivers/raw/ifpga/ifpga_rawdev.c +2
-0+}else { +args->port = port; } }else { IFPGA_RAWDEV_PMD_ERR("arg %s is mandatory for ifpgabus",
Quoted 5 lines
drivers/raw/ifpga/ifpga_rawdev.c +1
-1- IFPGA_ARG_PORT); +IFPGA_ARG_PORT); goto end; }Quoted 13 lines
drivers/raw/ifpga/ifpga_rawdev.c static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,
Quoted 13 lines
drivers/raw/ifpga/ifpga_rawdev.c +13
-0+ret =0 ; + +end: +if (kvlist) +rte_kvargs_free (kvlist); + +return ret; +} + +static int +ifpga_cfg_probe (struct rte_vdev_device *vdev) {struct rte_rawdev +*rawdev =NULL ;struct ifpga_rawdev *ifpga_dev;struct +ifpga_vdev_args args;char dev_name[RTE_RAWDEV_NAME_MAX_LEN];
Quoted 30 lines
Quoted 30 lines
drivers/raw/ifpga/ifpga_rawdev.c +7
-0+const char *vdev_name =NULL ; +int i, n, ret =0 ; + +vdev_name =rte_vdev_device_name (vdev);if (!vdev_name)return +-EINVAL ; + +IFPGA_RAWDEV_PMD_INFO("probe ifpga virtual device %s",
vdev_name);drivers/raw/ifpga/ifpga_rawdev.c +4
-0+ +ret =ifpga_vdev_parse_devargs (vdev->device.devargs, &args);if +(ret)return ret; + memset(dev_name, 0, sizeof(dev_name)); -snprintf(dev_name,
RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%s", name); +snprintf(dev_name,RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%s", args.bdf);
rawdev =rte_rawdev_pmd_get_named_dev(dev_name); if (!rawdev)drivers/raw/ifpga/ifpga_rawdev.c +2
-2-goto end; +return -ENODEV ; ifpga_dev = ifpga_rawdev_get(rawdev); if (!ifpga_dev) -goto end; +return -ENODEV ; -memset(dev_name, 0, sizeof(dev_name)); -snprintf(dev_name,
RTE_RAWDEV_NAME_MAX_LEN, "%d|%s", -port, name);drivers/raw/ifpga/ifpga_rawdev.c +4
-0+for (i =0 ; i <IFPGA_MAX_VDEV ; i++) {if (ifpga_dev->vdev_name[i] +==NULL ) { n =strlen (vdev_name) +1 ; ifpga_dev->vdev_name[i] = +rte_malloc (NULL , n,0 );if (ifpga_dev->vdev_name[i] ==NULL )return +-ENOMEM ;strlcpy (ifpga_dev->vdev_name[i], vdev_name, n);break ; } }Quoted 7 lines
drivers/raw/ifpga/ifpga_rawdev.c static int ifpga_rawdev_get_string_arg(const char *key __rte_unused, · line 1833
Quoted 7 lines
drivers/raw/ifpga/ifpga_rawdev.c +2
-0+if (i >=IFPGA_MAX_VDEV ) { +IFPGA_RAWDEV_PMD_ERR("Can't create more virtualdevice!");
drivers/raw/ifpga/ifpga_rawdev.c +4
-0+return -ENOENT ; +} + +snprintf(dev_name, RTE_RAWDEV_NAME_MAX_LEN, "%d|%s",args.port,
Quoted 11 lines
Quoted 11 lines
drivers/raw/ifpga/ifpga_rawdev.c +5
-4+args.bdf); ret =rte_eal_hotplug_add (RTE_STR (IFPGA_BUS_NAME ), -dev_name, devargs->args); -end: -rte_kvargs_free (kvlist); -free (name); +dev_name, vdev->device.devargs->args);if (ret) { +rte_free (ifpga_dev->vdev_name[i]); +ifpga_dev->vdev_name[i] =NULL ; +}Quoted 5 lines
Quoted 5 lines
return ret;
}drivers/raw/ifpga/ifpga_rawdev.c +0
-0@@ -1788,10 +1845,47 @@ static int ifpga_rawdev_get_string_arg(constchar *key
__rte_unused, static intifpga_cfg_remove(struct rte_vdev_device *vdev){ -IFPGA_RAWDEV_PMD_INFO("Remove
ifpga_cfgQuoted 21 lines
Quoted 21 lines
%p", -vdev);
drivers/raw/ifpga/ifpga_rawdev.c +11
-1+struct rte_rawdev *rawdev =NULL ; +struct ifpga_rawdev *ifpga_dev; +struct ifpga_vdev_args args; +char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; +const char *vdev_name =NULL ; +char *tmp_vdev =NULL ; +int i, ret =0 ; -return 0 ; +vdev_name =rte_vdev_device_name (vdev);if (!vdev_name)return +-EINVAL ; + +IFPGA_RAWDEV_PMD_INFO("remove ifpga virtual device %s",
vdev_name);drivers/raw/ifpga/ifpga_rawdev.c +6
-0+ +ret =ifpga_vdev_parse_devargs (vdev->device.devargs, &args);if +(ret)return ret; + +memset(dev_name, 0, sizeof(dev_name)); snprintf(dev_name, +RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%s",Quoted 8 lines
drivers/raw/ifpga/ifpga_rawdev.c static int ifpga_rawdev_get_string_arg(const char *key __rte_unused, · line 1875
Quoted 8 lines
args.bdf);
drivers/raw/ifpga/ifpga_rawdev.c +7
-0+rawdev =rte_rawdev_pmd_get_named_dev (dev_name); +if (!rawdev) +return -ENODEV ; +ifpga_dev =ifpga_rawdev_get (rawdev);if (!ifpga_dev)return +-ENODEV ; + +snprintf(dev_name, RTE_RAWDEV_NAME_MAX_LEN, "%d|%s",args.port,
Quoted 41 lines
Quoted 40 lines
+args.bdf); ret =
rte_eal_hotplug_remove(RTE_STR(IFPGA_BUS_NAME), dev_name);drivers/raw/ifpga/ifpga_rawdev.c +7
-0+ +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { tmp_vdev = +ifpga_dev->vdev_name[i];if (tmp_vdev && !strcmp (tmp_vdev, +vdev_name)) {free (tmp_vdev); ifpga_dev->vdev_name[i] =NULL ; +break ; } } + +return ret; } static struct rte_vdev_driver ifpga_cfg_driver = { diff --git
a/drivers/raw/ifpga/ifpga_rawdev.hb/drivers/raw/ifpga/ifpga_rawdev.hindex 857b734..eb9a9a5 100644drivers/raw/ifpga/ifpga_rawdev.h +8
-1@@ -50,6 +50,7 @@ enum ifpga_rawdev_device_state {#define IFPGA_RAWDEV_MSIX_IRQ_NUM 7#define IFPGA_RAWDEV_NUM 32 +#define IFPGA_MAX_VDEV 4#define IFPGA_MAX_IRQ 12struct ifpga_rawdev {@@ -64,6 +65,13 @@ struct ifpga_rawdev {void *intr_handle[IFPGA_MAX_IRQ ];/* enable monitor thread poll device's sensors or not */ int poll_enabled; +/* name of virtual devices created on raw device */ +char *vdev_name[IFPGA_MAX_VDEV ]; +}; + +struct ifpga_vdev_args { +char bdf[8 ]; +int port; }; struct ifpga_rawdev * --1.8.3.1
PATCH v4 1/1 raw/ifpga: remove vdev when ifpga is closed
In reply to Wei HuangVirtual devices created on ifpga raw device are not removed when ifpga is closed. To avoid such problem, ifpga virtual device remove function is implemented, virtual device is removed in raw device close function.
---
v2: cleanup vdev_name no matter rte_vdev_uninit succeed or not
---
v3: cleanup vdev_name in ifpga_cfg_remove
---
v4: add fix information in log
--- drivers/raw/ifpga/ifpga_rawdev.c | 166 ++++++++++++++++++++++++++++++--------- drivers/raw/ifpga/ifpga_rawdev.h | 8 ++ 2 files changed, 138 insertions(+), 36 deletions(-)
drivers/raw/ifpga/ifpga_rawdev.c +130 -36
@@ -134,6 +134,8 @@ struct ifpga_rawdev *for (i =0 ; i <IFPGA_MAX_IRQ ; i++) dev->intr_handle[i] =NULL ; dev->poll_enabled =0 ; +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) + dev->vdev_name[i] =NULL ;return dev; }
@@ -736,10 +738,22 @@ static int set_surprise_link_check_aer(static int ifpga_rawdev_close (struct rte_rawdev *dev) { +struct ifpga_rawdev *ifpga_rdev =NULL ;struct opae_adapter *adapter; +char *vdev_name =NULL ; +int i =0 ;if (dev) { -ifpga_monitor_stop_func (ifpga_rawdev_get (dev)); + ifpga_rdev =ifpga_rawdev_get (dev); +if (ifpga_rdev) { +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { + vdev_name = ifpga_rdev->vdev_name[i]; +if (vdev_name) +rte_vdev_uninit (vdev_name); + } +ifpga_monitor_stop_func (ifpga_rdev); + ifpga_rdev->rawdev =NULL ; + } adapter =ifpga_rawdev_get_priv (dev);if (adapter) {opae_adapter_destroy (adapter);
@@ -1638,8 +1652,6 @@ static int fme_clean_fme_error(struct opae_manager *mgr)return -EINVAL ; } dev =ifpga_rawdev_get (rawdev); -if (dev) - dev->rawdev =NULL ; adapter =ifpga_rawdev_get_priv (rawdev);if (!adapter)
@@ -1714,73 +1726,118 @@ static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,return 0 ; } +static int -ifpga_cfg_probe (struct rte_vdev_device *dev) +ifpga_vdev_parse_devargs (struct rte_devargs *devargs, +struct ifpga_vdev_args *args) { -struct rte_devargs *devargs; -struct rte_kvargs *kvlist =NULL ; -struct rte_rawdev *rawdev =NULL ; -struct ifpga_rawdev *ifpga_dev; -int port; +struct rte_kvargs *kvlist;char *name =NULL ; -char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; -int ret =-1 ; +int port =0 ; +int ret = -EINVAL ; - devargs = dev->device.devargs; +if (!devargs || !args) +return ret; kvlist =rte_kvargs_parse (devargs->args, valid_args);if (!kvlist) { -IFPGA_RAWDEV_PMD_LOG (ERR ,"error when parsing param" ); - goto end; +IFPGA_RAWDEV_PMD_ERR ("error when parsing devargs" ); +return ret; }if (rte_kvargs_count (kvlist,IFPGA_ARG_NAME ) ==1 ) {if (rte_kvargs_process (kvlist,IFPGA_ARG_NAME , - &ifpga_rawdev_get_string_arg, - &name) <0 ) { + &ifpga_rawdev_get_string_arg, &name) <0 ) {IFPGA_RAWDEV_PMD_ERR ("error to parse %s" , -IFPGA_ARG_NAME ); +IFPGA_ARG_NAME ); goto end; + }else { +strlcpy (args->bdf, name,sizeof (args->bdf)); +rte_free (name); } }else {IFPGA_RAWDEV_PMD_ERR ("arg %s is mandatory for ifpga bus" , -IFPGA_ARG_NAME ); +IFPGA_ARG_NAME ); goto end; }if (rte_kvargs_count (kvlist,IFPGA_ARG_PORT ) ==1 ) { -if (rte_kvargs_process (kvlist, -IFPGA_ARG_PORT , - &rte_ifpga_get_integer32_arg, - &port) <0 ) { +if (rte_kvargs_process (kvlist,IFPGA_ARG_PORT , + &rte_ifpga_get_integer32_arg, &port) <0 ) {IFPGA_RAWDEV_PMD_ERR ("error to parse %s" ,IFPGA_ARG_PORT ); goto end; + }else { + args->port = port; } }else {IFPGA_RAWDEV_PMD_ERR ("arg %s is mandatory for ifpga bus" , -IFPGA_ARG_PORT ); +IFPGA_ARG_PORT ); goto end; } + ret =0 ; + +end: +if (kvlist) +rte_kvargs_free (kvlist); + +return ret; +} + +static int +ifpga_cfg_probe (struct rte_vdev_device *vdev) +{ +struct rte_rawdev *rawdev =NULL ; +struct ifpga_rawdev *ifpga_dev; +struct ifpga_vdev_args args; +char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; +const char *vdev_name =NULL ; +int i, n, ret =0 ; + + vdev_name =rte_vdev_device_name (vdev); +if (!vdev_name) +return -EINVAL ; + +IFPGA_RAWDEV_PMD_INFO ("probe ifpga virtual device %s" , vdev_name); + + ret =ifpga_vdev_parse_devargs (vdev->device.devargs, &args); +if (ret) +return ret; +memset (dev_name,0 ,sizeof (dev_name)); -snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"IFPGA:%s" , name); +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"IFPGA:%s" , args.bdf); rawdev =rte_rawdev_pmd_get_named_dev (dev_name);if (!rawdev) - goto end; +return -ENODEV ; ifpga_dev =ifpga_rawdev_get (rawdev);if (!ifpga_dev) - goto end; +return -ENODEV ; -memset (dev_name,0 ,sizeof (dev_name)); -snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , - port, name); +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { +if (ifpga_dev->vdev_name[i] ==NULL ) { + n =strlen (vdev_name) +1 ; + ifpga_dev->vdev_name[i] =rte_malloc (NULL , n,0 ); +if (ifpga_dev->vdev_name[i] ==NULL ) +return -ENOMEM ; +strlcpy (ifpga_dev->vdev_name[i], vdev_name, n); +break ; + } + } +if (i >=IFPGA_MAX_VDEV ) { +IFPGA_RAWDEV_PMD_ERR ("Can't create more virtual device!" ); +return -ENOENT ; + } + +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , + args.port, args.bdf); ret =rte_eal_hotplug_add (RTE_STR (IFPGA_BUS_NAME ), - dev_name, devargs->args); -end: -rte_kvargs_free (kvlist); -free (name); + dev_name, vdev->device.devargs->args); +if (ret) { +rte_free (ifpga_dev->vdev_name[i]); + ifpga_dev->vdev_name[i] =NULL ; + }return ret; }
@@ -1788,10 +1845,47 @@ static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,static int ifpga_cfg_remove (struct rte_vdev_device *vdev) { -IFPGA_RAWDEV_PMD_INFO ("Remove ifpga_cfg %p" , - vdev); +struct rte_rawdev *rawdev =NULL ; +struct ifpga_rawdev *ifpga_dev; +struct ifpga_vdev_args args; +char dev_name[RTE_RAWDEV_NAME_MAX_LEN ]; +const char *vdev_name =NULL ; +char *tmp_vdev =NULL ; +int i, ret =0 ; -return 0 ; + vdev_name =rte_vdev_device_name (vdev); +if (!vdev_name) +return -EINVAL ; + +IFPGA_RAWDEV_PMD_INFO ("remove ifpga virtual device %s" , vdev_name); + + ret =ifpga_vdev_parse_devargs (vdev->device.devargs, &args); +if (ret) +return ret; + +memset (dev_name,0 ,sizeof (dev_name)); +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"IFPGA:%s" , args.bdf); + rawdev =rte_rawdev_pmd_get_named_dev (dev_name); +if (!rawdev) +return -ENODEV ; + ifpga_dev =ifpga_rawdev_get (rawdev); +if (!ifpga_dev) +return -ENODEV ; + +snprintf (dev_name,RTE_RAWDEV_NAME_MAX_LEN ,"%d|%s" , + args.port, args.bdf); + ret =rte_eal_hotplug_remove (RTE_STR (IFPGA_BUS_NAME ), dev_name); + +for (i =0 ; i <IFPGA_MAX_VDEV ; i++) { + tmp_vdev = ifpga_dev->vdev_name[i]; +if (tmp_vdev && !strcmp (tmp_vdev, vdev_name)) { +free (tmp_vdev); + ifpga_dev->vdev_name[i] =NULL ; +break ; + } + } + +return ret; }static struct rte_vdev_driver ifpga_cfg_driver = {
drivers/raw/ifpga/ifpga_rawdev.h +8 -0
@@ -50,6 +50,7 @@ enum ifpga_rawdev_device_state {#define IFPGA_RAWDEV_MSIX_IRQ_NUM 7#define IFPGA_RAWDEV_NUM 32 +#define IFPGA_MAX_VDEV 4#define IFPGA_MAX_IRQ 12struct ifpga_rawdev {
@@ -64,6 +65,13 @@ struct ifpga_rawdev {void *intr_handle[IFPGA_MAX_IRQ ];/* enable monitor thread poll device's sensors or not */ int poll_enabled; +/* name of virtual devices created on raw device */ +char *vdev_name[IFPGA_MAX_VDEV ]; +}; + +struct ifpga_vdev_args { +char bdf[8 ]; +int port; }; struct ifpga_rawdev *
Signature · 1 line
1.8.3.1