patch 'vdpa/ifc: handle data path update failure' has been queued to stable release 19.11.14
Christian Ehrhardt
christian.ehrhardt at canonical.com
Thu Nov 24 15:04:08 CET 2022
On Thu, Nov 24, 2022 at 3:00 PM <christian.ehrhardt at canonical.com> wrote:
>
> Hi,
>
> FYI, your patch has been queued to stable release 19.11.14
Sorry, this caused build errors so I had to withdraw it again.
> Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
> It will be pushed if I get no objections before 11/26/22. So please
> shout if anyone has objections.
>
> Also note that after the patch there's a diff of the upstream commit vs the
> patch applied to the branch. This will indicate if there was any rebasing
> needed to apply to the stable branch. If there were code changes for rebasing
> (ie: not only metadata diffs), please double check that the rebase was
> correctly done.
>
> Queued patches are on a temporary branch at:
> https://github.com/cpaelzer/dpdk-stable-queue
>
> This queued commit can be viewed at:
> https://github.com/cpaelzer/dpdk-stable-queue/commit/b9dbbd4a5a69f467f2e2762c7fafd79a7fb72a2c
>
> Thanks.
>
> Christian Ehrhardt <christian.ehrhardt at canonical.com>
>
> ---
> From b9dbbd4a5a69f467f2e2762c7fafd79a7fb72a2c Mon Sep 17 00:00:00 2001
> From: Taekyung Kim <kim.tae.kyung at navercorp.com>
> Date: Thu, 10 Nov 2022 13:09:43 +0900
> Subject: [PATCH] vdpa/ifc: handle data path update failure
>
> [ upstream commit 903ec2b1b49e496815c016b0104fd655cd972661 ]
>
> 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.
>
> Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver")
>
> Signed-off-by: Taekyung Kim <kim.tae.kyung at navercorp.com>
> Reviewed-by: Chenbo Xia <chenbo.xia at intel.com>
> Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
> Acked-by: Andy Pei <andy.pei at intel.com>
> ---
> drivers/net/ifc/ifcvf_vdpa.c | 27 +++++++++++++++++++++++----
> 1 file changed, 23 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifc/ifcvf_vdpa.c
> index e0044ec29e..0981b61242 100644
> --- a/drivers/net/ifc/ifcvf_vdpa.c
> +++ b/drivers/net/ifc/ifcvf_vdpa.c
> @@ -893,7 +893,12 @@ 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 for vDPA device %s",
> + vdev->device->name);
> + rte_atomic32_set(&internal->dev_attached, 0);
> + return -1;
> + }
>
> if (rte_vhost_host_notifier_ctrl(vid, true) != 0)
> DRV_LOG(NOTICE, "vDPA (%d): software relay is used.", did);
> @@ -933,7 +938,12 @@ 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 for vDPA device %s",
> + vdev->device->name);
> + internal->configured = 0;
> + return -1;
> + }
> }
>
> return 0;
> @@ -1202,7 +1212,15 @@ 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);
> + rte_atomic32_set(&internal->started, 0);
> + rte_vdpa_unregister_device(internal->vdev);
> + pthread_mutex_lock(&internal_list_lock);
> + TAILQ_REMOVE(&internal_list, list, next);
> + pthread_mutex_unlock(&internal_list_lock);
> + goto error;
> + }
>
> rte_kvargs_free(kvlist);
> return 0;
> @@ -1231,7 +1249,8 @@ 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);
>
> rte_pci_unmap_device(internal->pdev);
> rte_vfio_container_destroy(internal->vfio_container_fd);
> --
> 2.38.1
>
> ---
> Diff of the applied patch vs upstream commit (please double-check if non-empty:
> ---
> --- - 2022-11-24 14:58:12.152133231 +0100
> +++ 0001-vdpa-ifc-handle-data-path-update-failure.patch 2022-11-24 14:58:11.805189452 +0100
> @@ -1 +1 @@
> -From 903ec2b1b49e496815c016b0104fd655cd972661 Mon Sep 17 00:00:00 2001
> +From b9dbbd4a5a69f467f2e2762c7fafd79a7fb72a2c Mon Sep 17 00:00:00 2001
> @@ -5,0 +6,2 @@
> +[ upstream commit 903ec2b1b49e496815c016b0104fd655cd972661 ]
> +
> @@ -12 +13,0 @@
> -Cc: stable at dpdk.org
> @@ -19 +20 @@
> - drivers/vdpa/ifc/ifcvf_vdpa.c | 27 +++++++++++++++++++++++----
> + drivers/net/ifc/ifcvf_vdpa.c | 27 +++++++++++++++++++++++----
> @@ -22,5 +23,5 @@
> -diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
> -index 8dfd49336e..49d68ad1b1 100644
> ---- a/drivers/vdpa/ifc/ifcvf_vdpa.c
> -+++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
> -@@ -1098,7 +1098,12 @@ ifcvf_dev_config(int vid)
> +diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifc/ifcvf_vdpa.c
> +index e0044ec29e..0981b61242 100644
> +--- a/drivers/net/ifc/ifcvf_vdpa.c
> ++++ b/drivers/net/ifc/ifcvf_vdpa.c
> +@@ -893,7 +893,12 @@ ifcvf_dev_config(int vid)
> @@ -38,3 +39,3 @@
> - hw = &internal->hw;
> - for (i = 0; i < hw->nr_vring; i++) {
> -@@ -1146,7 +1151,12 @@ ifcvf_dev_close(int vid)
> + if (rte_vhost_host_notifier_ctrl(vid, true) != 0)
> + DRV_LOG(NOTICE, "vDPA (%d): software relay is used.", did);
> +@@ -933,7 +938,12 @@ ifcvf_dev_close(int vid)
> @@ -53,3 +54,3 @@
> - internal->configured = 0;
> -@@ -1752,7 +1762,15 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
> - }
> + return 0;
> +@@ -1202,7 +1212,15 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
> + pthread_mutex_unlock(&internal_list_lock);
> @@ -71 +72 @@
> -@@ -1781,7 +1799,8 @@ ifcvf_pci_remove(struct rte_pci_device *pci_dev)
> +@@ -1231,7 +1249,8 @@ ifcvf_pci_remove(struct rte_pci_device *pci_dev)
--
Christian Ehrhardt
Senior Staff Engineer, Ubuntu Server
Canonical Ltd
More information about the stable
mailing list