Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/99759

_apply patch failure_

Submitter: jilei chen <chenjilei@cmss.chinamobile.com>
Date: Monday, September 27 2021 10:17:55 
Applied on: CommitID:2700326085033fd13339a8de31f58a95d1ee9c3f
Apply patch set 99759 failed:

Checking patch drivers/vdpa/ifc/ifcvf_vdpa.c...
error: while searching for:
}

static int
ifcvf_dma_map(struct ifcvf_internal *internal, int do_map)
{
	uint32_t i;
	int ret;

error: patch failed: drivers/vdpa/ifc/ifcvf_vdpa.c:182
error: while searching for:
	if (!rte_atomic32_read(&internal->running) &&
	    (rte_atomic32_read(&internal->started) &&
	     rte_atomic32_read(&internal->dev_attached))) {
		ret = ifcvf_dma_map(internal, 1);
		if (ret)
			goto err;

		ret = vdpa_enable_vfio_intr(internal, 0);
		if (ret)
			goto err;


error: patch failed: drivers/vdpa/ifc/ifcvf_vdpa.c:538
error: while searching for:
		if (ret)
			goto err;

		ret = ifcvf_dma_map(internal, 0);
		if (ret)
			goto err;


error: patch failed: drivers/vdpa/ifc/ifcvf_vdpa.c:568
error: while searching for:
		goto error;

	/* set up interrupt for interrupt relay */
	ret = vdpa_enable_vfio_intr(internal, 1);
	if (ret)
		goto unmap;


error: patch failed: drivers/vdpa/ifc/ifcvf_vdpa.c:850
error: while searching for:
unset_intr:
	vdpa_disable_vfio_intr(internal);
unmap:
	ifcvf_dma_map(internal, 0);
error:
	return -1;
}

error: patch failed: drivers/vdpa/ifc/ifcvf_vdpa.c:875
error: while searching for:
		vdpa_disable_vfio_intr(internal);

		/* unset DMA map for guest memory */
		ifcvf_dma_map(internal, 0);

		internal->sw_fallback_running = false;
	} else {

error: patch failed: drivers/vdpa/ifc/ifcvf_vdpa.c:934
error: while searching for:
	}

	if (state && !hw->vring[vring].enable) {
		ret = vdpa_enable_vfio_intr(internal, 0);
		if (ret)
			return ret;
	}

error: patch failed: drivers/vdpa/ifc/ifcvf_vdpa.c:1130
Applying patch drivers/vdpa/ifc/ifcvf_vdpa.c with 7 rejects...
Rejected hunk #1.
Rejected hunk #2.
Rejected hunk #3.
Rejected hunk #4.
Rejected hunk #5.
Rejected hunk #6.
Rejected hunk #7.
diff a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c	(rejected hunks)
@@ -182,7 +182,7 @@ ifcvf_vfio_setup(struct ifcvf_internal *internal)
 }
 
 static int
-ifcvf_dma_map(struct ifcvf_internal *internal, int do_map)
+ifcvf_dma_map(struct ifcvf_internal *internal, bool do_map)
 {
 	uint32_t i;
 	int ret;
@@ -538,11 +538,11 @@ update_datapath(struct ifcvf_internal *internal)
 	if (!rte_atomic32_read(&internal->running) &&
 	    (rte_atomic32_read(&internal->started) &&
 	     rte_atomic32_read(&internal->dev_attached))) {
-		ret = ifcvf_dma_map(internal, 1);
+		ret = ifcvf_dma_map(internal, true);
 		if (ret)
 			goto err;
 
-		ret = vdpa_enable_vfio_intr(internal, 0);
+		ret = vdpa_enable_vfio_intr(internal, false);
 		if (ret)
 			goto err;
 
@@ -568,7 +568,7 @@ update_datapath(struct ifcvf_internal *internal)
 		if (ret)
 			goto err;
 
-		ret = ifcvf_dma_map(internal, 0);
+		ret = ifcvf_dma_map(internal, false);
 		if (ret)
 			goto err;
 
@@ -850,7 +850,7 @@ ifcvf_sw_fallback_switchover(struct ifcvf_internal *internal)
 		goto error;
 
 	/* set up interrupt for interrupt relay */
-	ret = vdpa_enable_vfio_intr(internal, 1);
+	ret = vdpa_enable_vfio_intr(internal, true);
 	if (ret)
 		goto unmap;
 
@@ -875,7 +875,7 @@ ifcvf_sw_fallback_switchover(struct ifcvf_internal *internal)
 unset_intr:
 	vdpa_disable_vfio_intr(internal);
 unmap:
-	ifcvf_dma_map(internal, 0);
+	ifcvf_dma_map(internal, false);
 error:
 	return -1;
 }
@@ -934,7 +934,7 @@ ifcvf_dev_close(int vid)
 		vdpa_disable_vfio_intr(internal);
 
 		/* unset DMA map for guest memory */
-		ifcvf_dma_map(internal, 0);
+		ifcvf_dma_map(internal, false);
 
 		internal->sw_fallback_running = false;
 	} else {
@@ -1130,7 +1130,7 @@ ifcvf_set_vring_state(int vid, int vring, int state)
 	}
 
 	if (state && !hw->vring[vring].enable) {
-		ret = vdpa_enable_vfio_intr(internal, 0);
+		ret = vdpa_enable_vfio_intr(internal, false);
 		if (ret)
 			return ret;
 	}

https://lab.dpdk.org/results/dashboard/patchsets/18986/

UNH-IOL DPDK Community Lab