Merge: vmxnet3: unregister xdp rxq info in the reset path

jstancek · jstancek · commit 98c90ea85a80 · 2025-05-28T07:26:33.000+02:00
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6882 vmxnet3: unregister xdp rxq info in the reset path JIRA: https://issues.redhat.com/browse/RHEL-30011 Signed-off-by: Izabela Bakollari <ibakolla@redhat.com> Approved-by: José Ignacio Tornos Martínez <jtornosm@redhat.com> Approved-by: mheib <mheib@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Jan Stancek <jstancek@redhat.com>
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -2033,6 +2033,11 @@ vmxnet3_rq_cleanup(struct vmxnet3_rx_queue *rq,
 
 	rq->comp_ring.gen = VMXNET3_INIT_GEN;
 	rq->comp_ring.next2proc = 0;
+
+	if (xdp_rxq_info_is_reg(&rq->xdp_rxq))
+		xdp_rxq_info_unreg(&rq->xdp_rxq);
+	page_pool_destroy(rq->page_pool);
+	rq->page_pool = NULL;
 }
 
 
@@ -2073,11 +2078,6 @@ static void vmxnet3_rq_destroy(struct vmxnet3_rx_queue *rq,
 		}
 	}
 
-	if (xdp_rxq_info_is_reg(&rq->xdp_rxq))
-		xdp_rxq_info_unreg(&rq->xdp_rxq);
-	page_pool_destroy(rq->page_pool);
-	rq->page_pool = NULL;
-
 	if (rq->data_ring.base) {
 		dma_free_coherent(&adapter->pdev->dev,
 				  rq->rx_ring[0].size * rq->data_ring.desc_size,

Original file line number	Diff line number	Diff line change
`@@ -2033,6 +2033,11 @@ vmxnet3_rq_cleanup(struct vmxnet3_rx_queue *rq,`
`2033`	`2033`
`2034`	`2034`	`rq->comp_ring.gen = VMXNET3_INIT_GEN;`
`2035`	`2035`	`rq->comp_ring.next2proc = 0;`
	`2036`	`+`
	`2037`	`+ if (xdp_rxq_info_is_reg(&rq->xdp_rxq))`
	`2038`	`+ xdp_rxq_info_unreg(&rq->xdp_rxq);`
	`2039`	`+ page_pool_destroy(rq->page_pool);`
	`2040`	`+ rq->page_pool = NULL;`
`2036`	`2041`	`}`
`2037`	`2042`
`2038`	`2043`
`@@ -2073,11 +2078,6 @@ static void vmxnet3_rq_destroy(struct vmxnet3_rx_queue *rq,`
`2073`	`2078`	`}`
`2074`	`2079`	`}`
`2075`	`2080`
`2076`		`- if (xdp_rxq_info_is_reg(&rq->xdp_rxq))`
`2077`		`- xdp_rxq_info_unreg(&rq->xdp_rxq);`
`2078`		`- page_pool_destroy(rq->page_pool);`
`2079`		`- rq->page_pool = NULL;`
`2080`		`-`
`2081`	`2081`	`if (rq->data_ring.base) {`
`2082`	`2082`	`dma_free_coherent(&adapter->pdev->dev,`
`2083`	`2083`	`rq->rx_ring[0].size * rq->data_ring.desc_size,`