* [PATCH v1] bus/ifpga: add fpga bus cleanup
@ 2023-03-16 20:44 Wei Huang
2023-03-20 6:45 ` Xu, Rosen
2023-03-20 7:54 ` Zhang, Tianfei
0 siblings, 2 replies; 4+ messages in thread
From: Wei Huang @ 2023-03-16 20:44 UTC (permalink / raw)
To: dev, thomas, david.marchand
Cc: stable, rosen.xu, tianfei.zhang, qi.z.zhang, Wei Huang
In this patch, cleanup method is implemented for FPGA bus
which will be called during eal_bus_cleanup().
Signed-off-by: Wei Huang <wei.huang@intel.com>
---
drivers/bus/ifpga/ifpga_bus.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index 07e316b..ffb0c61 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -360,6 +360,41 @@ struct rte_afu_device *
return ret;
}
+/*
+ * Cleanup the content of the Intel FPGA bus, and call the remove() function
+ * for all registered devices.
+ */
+static int
+ifpga_cleanup(void)
+{
+ struct rte_afu_device *afu_dev, *tmp_dev;
+ int error = 0;
+
+ RTE_TAILQ_FOREACH_SAFE(afu_dev, &ifpga_afu_dev_list, next, tmp_dev) {
+ struct rte_afu_driver *drv = afu_dev->driver;
+ int ret = 0;
+
+ if (drv == NULL || drv->remove == NULL)
+ goto free;
+
+ ret = drv->remove(afu_dev);
+ if (ret < 0) {
+ rte_errno = errno;
+ error = -1;
+ }
+ afu_dev->driver = NULL;
+ afu_dev->device.driver = NULL;
+
+free:
+ TAILQ_REMOVE(&ifpga_afu_dev_list, afu_dev, next);
+ rte_devargs_remove(afu_dev->device.devargs);
+ rte_intr_instance_free(afu_dev->intr_handle);
+ free(afu_dev);
+ }
+
+ return error;
+}
+
static int
ifpga_plug(struct rte_device *dev)
{
@@ -470,6 +505,7 @@ struct rte_afu_device *
static struct rte_bus rte_ifpga_bus = {
.scan = ifpga_scan,
.probe = ifpga_probe,
+ .cleanup = ifpga_cleanup,
.find_device = ifpga_find_device,
.plug = ifpga_plug,
.unplug = ifpga_unplug,
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH v1] bus/ifpga: add fpga bus cleanup
2023-03-16 20:44 [PATCH v1] bus/ifpga: add fpga bus cleanup Wei Huang
@ 2023-03-20 6:45 ` Xu, Rosen
2023-03-20 15:59 ` Thomas Monjalon
2023-03-20 7:54 ` Zhang, Tianfei
1 sibling, 1 reply; 4+ messages in thread
From: Xu, Rosen @ 2023-03-20 6:45 UTC (permalink / raw)
To: Huang, Wei, dev, thomas, david.marchand
Cc: stable, Zhang, Tianfei, Zhang, Qi Z
Hi,
> -----Original Message-----
> From: Huang, Wei <wei.huang@intel.com>
> Sent: Friday, March 17, 2023 4:45 AM
> To: dev@dpdk.org; thomas@monjalon.net; david.marchand@redhat.com
> Cc: stable@dpdk.org; Xu, Rosen <rosen.xu@intel.com>; Zhang, Tianfei
> <tianfei.zhang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>; Huang, Wei
> <wei.huang@intel.com>
> Subject: [PATCH v1] bus/ifpga: add fpga bus cleanup
>
> In this patch, cleanup method is implemented for FPGA bus which will be
> called during eal_bus_cleanup().
>
> Signed-off-by: Wei Huang <wei.huang@intel.com>
> ---
> drivers/bus/ifpga/ifpga_bus.c | 36
> ++++++++++++++++++++++++++++++++++++
> 1 file changed, 36 insertions(+)
>
> diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
> index 07e316b..ffb0c61 100644
> --- a/drivers/bus/ifpga/ifpga_bus.c
> +++ b/drivers/bus/ifpga/ifpga_bus.c
> @@ -360,6 +360,41 @@ struct rte_afu_device *
> return ret;
> }
>
> +/*
> + * Cleanup the content of the Intel FPGA bus, and call the remove()
> +function
> + * for all registered devices.
> + */
> +static int
> +ifpga_cleanup(void)
> +{
> + struct rte_afu_device *afu_dev, *tmp_dev;
> + int error = 0;
> +
> + RTE_TAILQ_FOREACH_SAFE(afu_dev, &ifpga_afu_dev_list, next,
> tmp_dev) {
> + struct rte_afu_driver *drv = afu_dev->driver;
> + int ret = 0;
> +
> + if (drv == NULL || drv->remove == NULL)
> + goto free;
> +
> + ret = drv->remove(afu_dev);
> + if (ret < 0) {
> + rte_errno = errno;
> + error = -1;
> + }
> + afu_dev->driver = NULL;
> + afu_dev->device.driver = NULL;
> +
> +free:
> + TAILQ_REMOVE(&ifpga_afu_dev_list, afu_dev, next);
> + rte_devargs_remove(afu_dev->device.devargs);
> + rte_intr_instance_free(afu_dev->intr_handle);
> + free(afu_dev);
> + }
> +
> + return error;
> +}
> +
> static int
> ifpga_plug(struct rte_device *dev)
> {
> @@ -470,6 +505,7 @@ struct rte_afu_device * static struct rte_bus
> rte_ifpga_bus = {
> .scan = ifpga_scan,
> .probe = ifpga_probe,
> + .cleanup = ifpga_cleanup,
> .find_device = ifpga_find_device,
> .plug = ifpga_plug,
> .unplug = ifpga_unplug,
> --
> 1.8.3.1
Acked-by: Rosen Xu <rosen.xu@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH v1] bus/ifpga: add fpga bus cleanup
2023-03-16 20:44 [PATCH v1] bus/ifpga: add fpga bus cleanup Wei Huang
2023-03-20 6:45 ` Xu, Rosen
@ 2023-03-20 7:54 ` Zhang, Tianfei
1 sibling, 0 replies; 4+ messages in thread
From: Zhang, Tianfei @ 2023-03-20 7:54 UTC (permalink / raw)
To: Huang, Wei, dev, thomas, david.marchand; +Cc: stable, Xu, Rosen, Zhang, Qi Z
> -----Original Message-----
> From: Huang, Wei <wei.huang@intel.com>
> Sent: Friday, March 17, 2023 4:45 AM
> To: dev@dpdk.org; thomas@monjalon.net; david.marchand@redhat.com
> Cc: stable@dpdk.org; Xu, Rosen <rosen.xu@intel.com>; Zhang, Tianfei
> <tianfei.zhang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>; Huang, Wei
> <wei.huang@intel.com>
> Subject: [PATCH v1] bus/ifpga: add fpga bus cleanup
>
> In this patch, cleanup method is implemented for FPGA bus which will be called
> during eal_bus_cleanup().
>
> Signed-off-by: Wei Huang <wei.huang@intel.com>
> ---
> drivers/bus/ifpga/ifpga_bus.c | 36 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 36 insertions(+)
>
> diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c index
> 07e316b..ffb0c61 100644
> --- a/drivers/bus/ifpga/ifpga_bus.c
> +++ b/drivers/bus/ifpga/ifpga_bus.c
> @@ -360,6 +360,41 @@ struct rte_afu_device *
> return ret;
> }
>
> +/*
> + * Cleanup the content of the Intel FPGA bus, and call the remove()
> +function
> + * for all registered devices.
> + */
> +static int
> +ifpga_cleanup(void)
> +{
> + struct rte_afu_device *afu_dev, *tmp_dev;
> + int error = 0;
> +
> + RTE_TAILQ_FOREACH_SAFE(afu_dev, &ifpga_afu_dev_list, next, tmp_dev) {
> + struct rte_afu_driver *drv = afu_dev->driver;
> + int ret = 0;
> +
> + if (drv == NULL || drv->remove == NULL)
> + goto free;
> +
> + ret = drv->remove(afu_dev);
> + if (ret < 0) {
> + rte_errno = errno;
> + error = -1;
> + }
> + afu_dev->driver = NULL;
> + afu_dev->device.driver = NULL;
> +
> +free:
> + TAILQ_REMOVE(&ifpga_afu_dev_list, afu_dev, next);
> + rte_devargs_remove(afu_dev->device.devargs);
> + rte_intr_instance_free(afu_dev->intr_handle);
> + free(afu_dev);
> + }
> +
> + return error;
> +}
> +
> static int
> ifpga_plug(struct rte_device *dev)
> {
> @@ -470,6 +505,7 @@ struct rte_afu_device * static struct rte_bus rte_ifpga_bus =
> {
> .scan = ifpga_scan,
> .probe = ifpga_probe,
> + .cleanup = ifpga_cleanup,
> .find_device = ifpga_find_device,
> .plug = ifpga_plug,
> .unplug = ifpga_unplug,
> --
> 1.8.3.1
This patch is based on EAL cleanup devices for shutdown.
https://github.com/DPDK/dpdk/commit/1cab1a40ea9b858821aaf4655486e31ca1b52456
It looks good for me,
Acked-by: Tianfei Zhang <tianfei.zhang@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] bus/ifpga: add fpga bus cleanup
2023-03-20 6:45 ` Xu, Rosen
@ 2023-03-20 15:59 ` Thomas Monjalon
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Monjalon @ 2023-03-20 15:59 UTC (permalink / raw)
To: Huang, Wei
Cc: dev, david.marchand, stable, Zhang, Tianfei, Zhang, Qi Z, Xu, Rosen
> > In this patch, cleanup method is implemented for FPGA bus which will be
> > called during eal_bus_cleanup().
> >
> > Signed-off-by: Wei Huang <wei.huang@intel.com>
>
> Acked-by: Rosen Xu <rosen.xu@intel.com>
It looks to be simple enough to go in -rc3.
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-20 16:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-16 20:44 [PATCH v1] bus/ifpga: add fpga bus cleanup Wei Huang
2023-03-20 6:45 ` Xu, Rosen
2023-03-20 15:59 ` Thomas Monjalon
2023-03-20 7:54 ` Zhang, Tianfei
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).