* [PATCH v1] raw/ifpga: check afu device before unplug
@ 2023-03-26 21:41 Wei Huang
2023-03-30 9:06 ` Zhang, Tianfei
2023-05-03 5:19 ` Xu, Rosen
0 siblings, 2 replies; 4+ messages in thread
From: Wei Huang @ 2023-03-26 21:41 UTC (permalink / raw)
To: dev, thomas, david.marchand
Cc: stable, rosen.xu, tianfei.zhang, qi.z.zhang, Wei Huang
AFU device may be already unplugged in IFPGA bus cleanup process,
unplug AFU device only when it exists.
Signed-off-by: Wei Huang <wei.huang@intel.com>
---
drivers/raw/ifpga/ifpga_rawdev.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index 1020adc..0d43c87 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -29,6 +29,7 @@
#include <bus_vdev_driver.h>
#include <rte_string_fns.h>
#include <rte_pmd_i40e.h>
+#include <bus_driver.h>
#include "base/opae_hw_api.h"
#include "base/opae_ifpga_hw_api.h"
@@ -1832,12 +1833,19 @@ static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,
return ret;
}
+static int cmp_dev_name(const struct rte_device *dev, const void *_name)
+{
+ const char *name = _name;
+ return strcmp(dev->name, name);
+}
+
static int
ifpga_cfg_remove(struct rte_vdev_device *vdev)
{
struct rte_rawdev *rawdev = NULL;
struct ifpga_rawdev *ifpga_dev;
struct ifpga_vdev_args args;
+ struct rte_bus *bus;
char dev_name[RTE_RAWDEV_NAME_MAX_LEN];
const char *vdev_name = NULL;
char *tmp_vdev = NULL;
@@ -1864,7 +1872,13 @@ static int ifpga_rawdev_get_string_arg(const char *key __rte_unused,
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);
+ bus = rte_bus_find_by_name(RTE_STR(IFPGA_BUS_NAME));
+ if (bus) {
+ if (bus->find_device(NULL, cmp_dev_name, dev_name)) {
+ 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];
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH v1] raw/ifpga: check afu device before unplug
2023-03-26 21:41 [PATCH v1] raw/ifpga: check afu device before unplug Wei Huang
@ 2023-03-30 9:06 ` Zhang, Tianfei
2023-06-12 20:30 ` Thomas Monjalon
2023-05-03 5:19 ` Xu, Rosen
1 sibling, 1 reply; 4+ messages in thread
From: Zhang, Tianfei @ 2023-03-30 9:06 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: Monday, March 27, 2023 5:42 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] raw/ifpga: check afu device before unplug
>
> AFU device may be already unplugged in IFPGA bus cleanup process, unplug AFU
> device only when it exists.
>
> Signed-off-by: Wei Huang <wei.huang@intel.com>
> ---
> drivers/raw/ifpga/ifpga_rawdev.c | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
> index 1020adc..0d43c87 100644
> --- a/drivers/raw/ifpga/ifpga_rawdev.c
> +++ b/drivers/raw/ifpga/ifpga_rawdev.c
> @@ -29,6 +29,7 @@
> #include <bus_vdev_driver.h>
> #include <rte_string_fns.h>
> #include <rte_pmd_i40e.h>
> +#include <bus_driver.h>
>
> #include "base/opae_hw_api.h"
> #include "base/opae_ifpga_hw_api.h"
> @@ -1832,12 +1833,19 @@ static int ifpga_rawdev_get_string_arg(const char *key
> __rte_unused,
> return ret;
> }
>
> +static int cmp_dev_name(const struct rte_device *dev, const void
> +*_name) {
> + const char *name = _name;
> + return strcmp(dev->name, name);
> +}
> +
> static int
> ifpga_cfg_remove(struct rte_vdev_device *vdev) {
> struct rte_rawdev *rawdev = NULL;
> struct ifpga_rawdev *ifpga_dev;
> struct ifpga_vdev_args args;
> + struct rte_bus *bus;
> char dev_name[RTE_RAWDEV_NAME_MAX_LEN];
> const char *vdev_name = NULL;
> char *tmp_vdev = NULL;
> @@ -1864,7 +1872,13 @@ static int ifpga_rawdev_get_string_arg(const char *key
> __rte_unused,
>
> 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);
> + bus = rte_bus_find_by_name(RTE_STR(IFPGA_BUS_NAME));
> + if (bus) {
> + if (bus->find_device(NULL, cmp_dev_name, dev_name)) {
> + ret =
> rte_eal_hotplug_remove(RTE_STR(IFPGA_BUS_NAME),
> + dev_name);
> + }
> + }
>
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] raw/ifpga: check afu device before unplug
2023-03-26 21:41 [PATCH v1] raw/ifpga: check afu device before unplug Wei Huang
2023-03-30 9:06 ` Zhang, Tianfei
@ 2023-05-03 5:19 ` Xu, Rosen
1 sibling, 0 replies; 4+ messages in thread
From: Xu, Rosen @ 2023-05-03 5:19 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: Monday, March 27, 2023 5:42 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] raw/ifpga: check afu device before unplug
>
> AFU device may be already unplugged in IFPGA bus cleanup process, unplug
> AFU device only when it exists.
>
> Signed-off-by: Wei Huang <wei.huang@intel.com>
> ---
> drivers/raw/ifpga/ifpga_rawdev.c | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/raw/ifpga/ifpga_rawdev.c
> b/drivers/raw/ifpga/ifpga_rawdev.c
> index 1020adc..0d43c87 100644
> --- a/drivers/raw/ifpga/ifpga_rawdev.c
> +++ b/drivers/raw/ifpga/ifpga_rawdev.c
> @@ -29,6 +29,7 @@
> #include <bus_vdev_driver.h>
> #include <rte_string_fns.h>
> #include <rte_pmd_i40e.h>
> +#include <bus_driver.h>
>
> #include "base/opae_hw_api.h"
> #include "base/opae_ifpga_hw_api.h"
> @@ -1832,12 +1833,19 @@ static int ifpga_rawdev_get_string_arg(const
> char *key __rte_unused,
> return ret;
> }
>
> +static int cmp_dev_name(const struct rte_device *dev, const void
> +*_name) {
> + const char *name = _name;
> + return strcmp(dev->name, name);
> +}
> +
> static int
> ifpga_cfg_remove(struct rte_vdev_device *vdev) {
> struct rte_rawdev *rawdev = NULL;
> struct ifpga_rawdev *ifpga_dev;
> struct ifpga_vdev_args args;
> + struct rte_bus *bus;
> char dev_name[RTE_RAWDEV_NAME_MAX_LEN];
> const char *vdev_name = NULL;
> char *tmp_vdev = NULL;
> @@ -1864,7 +1872,13 @@ static int ifpga_rawdev_get_string_arg(const char
> *key __rte_unused,
>
> 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);
> + bus = rte_bus_find_by_name(RTE_STR(IFPGA_BUS_NAME));
> + if (bus) {
> + if (bus->find_device(NULL, cmp_dev_name, dev_name)) {
> + 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];
> --
> 1.8.3.1
Reviewed-by: Rosen Xu <rosen.xu@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] raw/ifpga: check afu device before unplug
2023-03-30 9:06 ` Zhang, Tianfei
@ 2023-06-12 20:30 ` Thomas Monjalon
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Monjalon @ 2023-06-12 20:30 UTC (permalink / raw)
To: Huang, Wei
Cc: dev, david.marchand, stable, Xu, Rosen, Zhang, Qi Z, Zhang, Tianfei
> > AFU device may be already unplugged in IFPGA bus cleanup process, unplug AFU
> > device only when it exists.
> >
> > Signed-off-by: Wei Huang <wei.huang@intel.com>
>
> It looks good for me.
> Acked-by: Tianfei Zhang <tianfei.zhang@intel.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-12 20:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-26 21:41 [PATCH v1] raw/ifpga: check afu device before unplug Wei Huang
2023-03-30 9:06 ` Zhang, Tianfei
2023-06-12 20:30 ` Thomas Monjalon
2023-05-03 5:19 ` Xu, Rosen
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).