* [PATCH] vdpa/ifc: fix update datapath error handling
@ 2022-10-18 1:45 Taekyung Kim
0 siblings, 0 replies; 4+ messages in thread
From: Taekyung Kim @ 2022-10-18 1:45 UTC (permalink / raw)
To: dev; +Cc: Taekyung Kim, Xiao Wang
Stop and return the error code if update_datapath fails.
update_datapath prepares resources for the vdpa device.
The driver should not perform any further actions
if update_datapath returns an error.
Signed-off-by: Taekyung Kim <kim.tae.kyung@navercorp.com>
---
drivers/vdpa/ifc/ifcvf_vdpa.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
index d5ac583589..795967e998 100644
--- a/drivers/vdpa/ifc/ifcvf_vdpa.c
+++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
@@ -1063,7 +1063,10 @@ ifcvf_dev_config(int vid)
internal = list->internal;
internal->vid = vid;
rte_atomic32_set(&internal->dev_attached, 1);
- update_datapath(internal);
+ if (update_datapath(internal) < 0) {
+ DRV_LOG(ERR, "failed to update datapath: %p", vdev);
+ return -1;
+ }
if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
DRV_LOG(NOTICE, "vDPA (%s): software relay is used.",
@@ -1105,7 +1108,10 @@ ifcvf_dev_close(int vid)
internal->sw_fallback_running = false;
} else {
rte_atomic32_set(&internal->dev_attached, 0);
- update_datapath(internal);
+ if (update_datapath(internal) < 0) {
+ DRV_LOG(ERR, "failed to update datapath: %p", vdev);
+ return -1;
+ }
}
internal->configured = 0;
@@ -1632,7 +1638,10 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
pthread_mutex_unlock(&internal_list_lock);
rte_atomic32_set(&internal->started, 1);
- update_datapath(internal);
+ if (update_datapath(internal) < 0) {
+ DRV_LOG(ERR, "failed to update datapath: %s", pci_dev->name);
+ return -1;
+ }
rte_kvargs_free(kvlist);
return 0;
@@ -1661,7 +1670,10 @@ ifcvf_pci_remove(struct rte_pci_device *pci_dev)
internal = list->internal;
rte_atomic32_set(&internal->started, 0);
- update_datapath(internal);
+ if (update_datapath(internal) < 0) {
+ DRV_LOG(ERR, "failed to update datapath: %s", pci_dev->name);
+ return -1;
+ }
rte_pci_unmap_device(internal->pdev);
rte_vfio_container_destroy(internal->vfio_container_fd);
--
2.30.1 (Apple Git-130)
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] vdpa/ifc: fix update_datapath error handling
@ 2022-10-18 7:22 Taekyung Kim
2022-11-02 9:12 ` Maxime Coquelin
0 siblings, 1 reply; 4+ messages in thread
From: Taekyung Kim @ 2022-10-18 7:22 UTC (permalink / raw)
To: dev; +Cc: Maxime Coquelin, Taekyung Kim
Stop and return the error code if update_datapath fails.
update_datapath prepares resources for the vdpa device.
The driver should not perform any further actions
if update_datapath returns an error.
Signed-off-by: Taekyung Kim <kim.tae.kyung@navercorp.com>
---
drivers/vdpa/ifc/ifcvf_vdpa.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
index d5ac583589..795967e998 100644
--- a/drivers/vdpa/ifc/ifcvf_vdpa.c
+++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
@@ -1063,7 +1063,10 @@ ifcvf_dev_config(int vid)
internal = list->internal;
internal->vid = vid;
rte_atomic32_set(&internal->dev_attached, 1);
- update_datapath(internal);
+ if (update_datapath(internal) < 0) {
+ DRV_LOG(ERR, "failed to update datapath: %p", vdev);
+ return -1;
+ }
if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
DRV_LOG(NOTICE, "vDPA (%s): software relay is used.",
@@ -1105,7 +1108,10 @@ ifcvf_dev_close(int vid)
internal->sw_fallback_running = false;
} else {
rte_atomic32_set(&internal->dev_attached, 0);
- update_datapath(internal);
+ if (update_datapath(internal) < 0) {
+ DRV_LOG(ERR, "failed to update datapath: %p", vdev);
+ return -1;
+ }
}
internal->configured = 0;
@@ -1632,7 +1638,10 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
pthread_mutex_unlock(&internal_list_lock);
rte_atomic32_set(&internal->started, 1);
- update_datapath(internal);
+ if (update_datapath(internal) < 0) {
+ DRV_LOG(ERR, "failed to update datapath: %s", pci_dev->name);
+ return -1;
+ }
rte_kvargs_free(kvlist);
return 0;
@@ -1661,7 +1670,10 @@ ifcvf_pci_remove(struct rte_pci_device *pci_dev)
internal = list->internal;
rte_atomic32_set(&internal->started, 0);
- update_datapath(internal);
+ if (update_datapath(internal) < 0) {
+ DRV_LOG(ERR, "failed to update datapath: %s", pci_dev->name);
+ return -1;
+ }
rte_pci_unmap_device(internal->pdev);
rte_vfio_container_destroy(internal->vfio_container_fd);
--
2.30.1 (Apple Git-130)
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] vdpa/ifc: fix update_datapath error handling
2022-10-18 7:22 [PATCH] vdpa/ifc: fix update_datapath " Taekyung Kim
@ 2022-11-02 9:12 ` Maxime Coquelin
0 siblings, 0 replies; 4+ messages in thread
From: Maxime Coquelin @ 2022-11-02 9:12 UTC (permalink / raw)
To: Taekyung Kim, dev, Chenbo Xia, Xiao Wang
Hi,
On 10/18/22 09:22, Taekyung Kim wrote:
> Stop and return the error code if update_datapath fails.
> update_datapath prepares resources for the vdpa device.
> The driver should not perform any further actions
> if update_datapath returns an error.
You need to add Fixes tag and Cc stable@dpdk.org, so that it is
backported to relevant LTS branches.
>
> Signed-off-by: Taekyung Kim <kim.tae.kyung@navercorp.com>
> ---
> drivers/vdpa/ifc/ifcvf_vdpa.c | 20 ++++++++++++++++----
> 1 file changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
> index d5ac583589..795967e998 100644
> --- a/drivers/vdpa/ifc/ifcvf_vdpa.c
> +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
> @@ -1063,7 +1063,10 @@ ifcvf_dev_config(int vid)
> internal = list->internal;
> internal->vid = vid;
> rte_atomic32_set(&internal->dev_attached, 1);
> - update_datapath(internal);
> + if (update_datapath(internal) < 0) {
> + DRV_LOG(ERR, "failed to update datapath: %p", vdev);
> + return -1;
> + }
>
> if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
> DRV_LOG(NOTICE, "vDPA (%s): software relay is used.",
> @@ -1105,7 +1108,10 @@ ifcvf_dev_close(int vid)
> internal->sw_fallback_running = false;
> } else {
> rte_atomic32_set(&internal->dev_attached, 0);
> - update_datapath(internal);
> + if (update_datapath(internal) < 0) {
> + DRV_LOG(ERR, "failed to update datapath: %p", vdev);
> + return -1;
> + }
> }
>
> internal->configured = 0;
> @@ -1632,7 +1638,10 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
> pthread_mutex_unlock(&internal_list_lock);
>
> rte_atomic32_set(&internal->started, 1);
> - update_datapath(internal);
> + if (update_datapath(internal) < 0) {
> + DRV_LOG(ERR, "failed to update datapath: %s", pci_dev->name);
> + return -1;
> + }
This is not enough, you need to free resources allocated before,
otherwise you introduce memory leaks.
Basically, you should goto error instead o directly returning -1.
>
> rte_kvargs_free(kvlist);
> return 0;
> @@ -1661,7 +1670,10 @@ ifcvf_pci_remove(struct rte_pci_device *pci_dev)
>
> internal = list->internal;
> rte_atomic32_set(&internal->started, 0);
> - update_datapath(internal);
> + if (update_datapath(internal) < 0) {
> + DRV_LOG(ERR, "failed to update datapath: %s", pci_dev->name);
> + return -1;
> + }
I think we should not return early here, because we still want to clean
as much as possible on remove. maybe just keep the error message.
> rte_pci_unmap_device(internal->pdev);
> rte_vfio_container_destroy(internal->vfio_container_fd);
Thanks,
Maxime
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] vdpa/ifc: fix update_datapath error handling
@ 2022-10-14 13:18 Taekyung Kim
0 siblings, 0 replies; 4+ messages in thread
From: Taekyung Kim @ 2022-10-14 13:18 UTC (permalink / raw)
To: dev; +Cc: Taekyung Kim, Xiao Wang
Stop and return the error code when update_datapath fails.
update_datapath prepares resources for the vdpa device.
The driver should not perform any further actions
if update_datapath returns an error.
Signed-off-by: Taekyung Kim <kim.tae.kyung@navercorp.com>
---
drivers/vdpa/ifc/ifcvf_vdpa.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
index d5ac583589..795967e998 100644
--- a/drivers/vdpa/ifc/ifcvf_vdpa.c
+++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
@@ -1063,7 +1063,10 @@ ifcvf_dev_config(int vid)
internal = list->internal;
internal->vid = vid;
rte_atomic32_set(&internal->dev_attached, 1);
- update_datapath(internal);
+ if (update_datapath(internal) < 0) {
+ DRV_LOG(ERR, "failed to update datapath: %p", vdev);
+ return -1;
+ }
if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
DRV_LOG(NOTICE, "vDPA (%s): software relay is used.",
@@ -1105,7 +1108,10 @@ ifcvf_dev_close(int vid)
internal->sw_fallback_running = false;
} else {
rte_atomic32_set(&internal->dev_attached, 0);
- update_datapath(internal);
+ if (update_datapath(internal) < 0) {
+ DRV_LOG(ERR, "failed to update datapath: %p", vdev);
+ return -1;
+ }
}
internal->configured = 0;
@@ -1632,7 +1638,10 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
pthread_mutex_unlock(&internal_list_lock);
rte_atomic32_set(&internal->started, 1);
- update_datapath(internal);
+ if (update_datapath(internal) < 0) {
+ DRV_LOG(ERR, "failed to update datapath: %s", pci_dev->name);
+ return -1;
+ }
rte_kvargs_free(kvlist);
return 0;
@@ -1661,7 +1670,10 @@ ifcvf_pci_remove(struct rte_pci_device *pci_dev)
internal = list->internal;
rte_atomic32_set(&internal->started, 0);
- update_datapath(internal);
+ if (update_datapath(internal) < 0) {
+ DRV_LOG(ERR, "failed to update datapath: %s", pci_dev->name);
+ return -1;
+ }
rte_pci_unmap_device(internal->pdev);
rte_vfio_container_destroy(internal->vfio_container_fd);
--
2.37.0 (Apple Git-136)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-02 9:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-18 1:45 [PATCH] vdpa/ifc: fix update datapath error handling Taekyung Kim
-- strict thread matches above, loose matches on Subject: below --
2022-10-18 7:22 [PATCH] vdpa/ifc: fix update_datapath " Taekyung Kim
2022-11-02 9:12 ` Maxime Coquelin
2022-10-14 13:18 Taekyung Kim
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).