From patchwork Fri Sep 3 12:40:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harman Kalra X-Patchwork-Id: 97934 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0E77EA0C54; Fri, 3 Sep 2021 14:42:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7D293410E3; Fri, 3 Sep 2021 14:42:07 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 17916410DC for ; Fri, 3 Sep 2021 14:42:06 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1837tQF8012099 for ; Fri, 3 Sep 2021 05:42:05 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=wu9DsE71iPn3e/ZCR4S63ErigHchX37tDMn/KTIGpRA=; b=Ge+oZARFOeAStwRflXAFhzqhWGqP5WHFk5pQQhzW4mV3vYUzs8QXR4+nqoZ5f5uIMh4h e8ZlEv7zvqVlP2XObUdUcg8hqhAFZx7b8TOTQ0rgGiu5tE2l0q/Qq1DViFVvVgzwgy2G dyCQk0W9Phoh1pYMffYClOeyQsDwGws35K0HBeGQHbm4zmmTSEP9LEy/Vvq79RV4apPm XpLmeLFACIsgG+WggwkGcdZvCYPM686zMf+7Eect/OPnSHg4GaBWitQzpOrFL8C0Sd1V NP6GrRMNAeH/Ea4Anno6+7PeGOtcGqInnBXlkMK8rwPhV+rR7ErvrfkFlUV13cmdLysQ Iw== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com with ESMTP id 3aufr890ub-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Fri, 03 Sep 2021 05:42:05 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 3 Sep 2021 05:42:03 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Fri, 3 Sep 2021 05:42:03 -0700 Received: from localhost.localdomain (unknown [10.29.52.211]) by maili.marvell.com (Postfix) with ESMTP id 45FD25B6942; Fri, 3 Sep 2021 05:42:02 -0700 (PDT) From: Harman Kalra To: , Harman Kalra Date: Fri, 3 Sep 2021 18:10:59 +0530 Message-ID: <20210903124102.47425-5-hkalra@marvell.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210903124102.47425-1-hkalra@marvell.com> References: <20210826145726.102081-1-hkalra@marvell.com> <20210903124102.47425-1-hkalra@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: 796f237J6JYqPyaXD3i8Afmc4gkCnSOo X-Proofpoint-GUID: 796f237J6JYqPyaXD3i8Afmc4gkCnSOo X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475 definitions=2021-09-03_03,2021-09-03_01,2020-04-07_01 Subject: [dpdk-dev] [PATCH v1 4/7] test/interrupt: apply get set interrupt handle APIs X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Updating the interrupt testsuite to make use of interrupt handle get set APIs. Signed-off-by: Harman Kalra --- app/test/test_interrupts.c | 237 ++++++++++++++++++++++++------------- 1 file changed, 152 insertions(+), 85 deletions(-) diff --git a/app/test/test_interrupts.c b/app/test/test_interrupts.c index 233b14a70b..289bca66dd 100644 --- a/app/test/test_interrupts.c +++ b/app/test/test_interrupts.c @@ -27,7 +27,7 @@ enum test_interrupt_handle_type { /* flag of if callback is called */ static volatile int flag; -static struct rte_intr_handle intr_handles[TEST_INTERRUPT_HANDLE_MAX]; +static struct rte_intr_handle *intr_handles; static enum test_interrupt_handle_type test_intr_type = TEST_INTERRUPT_HANDLE_MAX; @@ -50,7 +50,7 @@ static union intr_pipefds pfds; static inline int test_interrupt_handle_sanity_check(struct rte_intr_handle *intr_handle) { - if (!intr_handle || intr_handle->fd < 0) + if (!intr_handle || rte_intr_handle_fd_get(intr_handle) < 0) return -1; return 0; @@ -62,31 +62,70 @@ test_interrupt_handle_sanity_check(struct rte_intr_handle *intr_handle) static int test_interrupt_init(void) { + struct rte_intr_handle *test_intr_handle; + if (pipe(pfds.pipefd) < 0) return -1; - intr_handles[TEST_INTERRUPT_HANDLE_INVALID].fd = -1; - intr_handles[TEST_INTERRUPT_HANDLE_INVALID].type = - RTE_INTR_HANDLE_UNKNOWN; + intr_handles = rte_intr_handle_instance_alloc(TEST_INTERRUPT_HANDLE_MAX, + false); + if (!intr_handles) + return -1; - intr_handles[TEST_INTERRUPT_HANDLE_VALID].fd = pfds.readfd; - intr_handles[TEST_INTERRUPT_HANDLE_VALID].type = - RTE_INTR_HANDLE_UNKNOWN; + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_INVALID); + if (!test_intr_handle) + return -1; + if (rte_intr_handle_fd_set(test_intr_handle, -1)) + return -1; + if (rte_intr_handle_type_set(test_intr_handle, RTE_INTR_HANDLE_UNKNOWN)) + return -1; - intr_handles[TEST_INTERRUPT_HANDLE_VALID_UIO].fd = pfds.readfd; - intr_handles[TEST_INTERRUPT_HANDLE_VALID_UIO].type = - RTE_INTR_HANDLE_UIO; + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID); + if (!test_intr_handle) + return -1; + if (rte_intr_handle_fd_set(test_intr_handle, pfds.readfd)) + return -1; + if (rte_intr_handle_type_set(test_intr_handle, RTE_INTR_HANDLE_UNKNOWN)) + return -1; + + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID_UIO); + if (!test_intr_handle) + return -1; + if (rte_intr_handle_fd_set(test_intr_handle, pfds.readfd)) + return -1; + if (rte_intr_handle_type_set(test_intr_handle, RTE_INTR_HANDLE_UIO)) + return -1; - intr_handles[TEST_INTERRUPT_HANDLE_VALID_ALARM].fd = pfds.readfd; - intr_handles[TEST_INTERRUPT_HANDLE_VALID_ALARM].type = - RTE_INTR_HANDLE_ALARM; + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID_ALARM); + if (!test_intr_handle) + return -1; + if (rte_intr_handle_fd_set(test_intr_handle, pfds.readfd)) + return -1; + if (rte_intr_handle_type_set(test_intr_handle, RTE_INTR_HANDLE_ALARM)) + return -1; - intr_handles[TEST_INTERRUPT_HANDLE_VALID_DEV_EVENT].fd = pfds.readfd; - intr_handles[TEST_INTERRUPT_HANDLE_VALID_DEV_EVENT].type = - RTE_INTR_HANDLE_DEV_EVENT; + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID_DEV_EVENT); + if (!test_intr_handle) + return -1; + if (rte_intr_handle_fd_set(test_intr_handle, pfds.readfd)) + return -1; + if (rte_intr_handle_type_set(test_intr_handle, + RTE_INTR_HANDLE_DEV_EVENT)) + return -1; - intr_handles[TEST_INTERRUPT_HANDLE_CASE1].fd = pfds.writefd; - intr_handles[TEST_INTERRUPT_HANDLE_CASE1].type = RTE_INTR_HANDLE_UIO; + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_CASE1); + if (!test_intr_handle) + return -1; + if (rte_intr_handle_fd_set(test_intr_handle, pfds.writefd)) + return -1; + if (rte_intr_handle_type_set(test_intr_handle, RTE_INTR_HANDLE_UIO)) + return -1; return 0; } @@ -97,6 +136,7 @@ test_interrupt_init(void) static int test_interrupt_deinit(void) { + rte_intr_handle_instance_free(intr_handles); close(pfds.pipefd[0]); close(pfds.pipefd[1]); @@ -125,8 +165,10 @@ test_interrupt_handle_compare(struct rte_intr_handle *intr_handle_l, if (!intr_handle_l || !intr_handle_r) return -1; - if (intr_handle_l->fd != intr_handle_r->fd || - intr_handle_l->type != intr_handle_r->type) + if (rte_intr_handle_fd_get(intr_handle_l) != + rte_intr_handle_fd_get(intr_handle_r) || + rte_intr_handle_type_get(intr_handle_l) != + rte_intr_handle_type_get(intr_handle_r)) return -1; return 0; @@ -178,6 +220,8 @@ static void test_interrupt_callback(void *arg) { struct rte_intr_handle *intr_handle = arg; + struct rte_intr_handle *test_intr_handle; + if (test_intr_type >= TEST_INTERRUPT_HANDLE_MAX) { printf("invalid interrupt type\n"); flag = -1; @@ -198,8 +242,9 @@ test_interrupt_callback(void *arg) return; } - if (test_interrupt_handle_compare(intr_handle, - &(intr_handles[test_intr_type])) == 0) + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + test_intr_type); + if (test_interrupt_handle_compare(intr_handle, test_intr_handle) == 0) flag = 1; } @@ -223,7 +268,7 @@ test_interrupt_callback_1(void *arg) static int test_interrupt_enable(void) { - struct rte_intr_handle test_intr_handle; + struct rte_intr_handle *test_intr_handle; /* check with null intr_handle */ if (rte_intr_enable(NULL) == 0) { @@ -232,46 +277,52 @@ test_interrupt_enable(void) } /* check with invalid intr_handle */ - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_INVALID]; - if (rte_intr_enable(&test_intr_handle) == 0) { + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_INVALID); + if (rte_intr_enable(test_intr_handle) == 0) { printf("unexpectedly enable invalid intr_handle " "successfully\n"); return -1; } /* check with valid intr_handle */ - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_VALID]; - if (rte_intr_enable(&test_intr_handle) == 0) { + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID); + if (rte_intr_enable(test_intr_handle) == 0) { printf("unexpectedly enable a specific intr_handle " "successfully\n"); return -1; } /* check with specific valid intr_handle */ - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_VALID_ALARM]; - if (rte_intr_enable(&test_intr_handle) == 0) { + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID_ALARM); + if (rte_intr_enable(test_intr_handle) == 0) { printf("unexpectedly enable a specific intr_handle " "successfully\n"); return -1; } /* check with specific valid intr_handle */ - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_VALID_DEV_EVENT]; - if (rte_intr_enable(&test_intr_handle) == 0) { + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID_DEV_EVENT); + if (rte_intr_enable(test_intr_handle) == 0) { printf("unexpectedly enable a specific intr_handle " "successfully\n"); return -1; } /* check with valid handler and its type */ - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_CASE1]; - if (rte_intr_enable(&test_intr_handle) < 0) { + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_CASE1); + if (rte_intr_enable(test_intr_handle) < 0) { printf("fail to enable interrupt on a simulated handler\n"); return -1; } - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_VALID_UIO]; - if (rte_intr_enable(&test_intr_handle) == 0) { + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID_UIO); + if (rte_intr_enable(test_intr_handle) == 0) { printf("unexpectedly enable a specific intr_handle " "successfully\n"); return -1; @@ -286,7 +337,7 @@ test_interrupt_enable(void) static int test_interrupt_disable(void) { - struct rte_intr_handle test_intr_handle; + struct rte_intr_handle *test_intr_handle; /* check with null intr_handle */ if (rte_intr_disable(NULL) == 0) { @@ -296,46 +347,52 @@ test_interrupt_disable(void) } /* check with invalid intr_handle */ - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_INVALID]; - if (rte_intr_disable(&test_intr_handle) == 0) { + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_INVALID); + if (rte_intr_disable(test_intr_handle) == 0) { printf("unexpectedly disable invalid intr_handle " "successfully\n"); return -1; } /* check with valid intr_handle */ - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_VALID]; - if (rte_intr_disable(&test_intr_handle) == 0) { + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID); + if (rte_intr_disable(test_intr_handle) == 0) { printf("unexpectedly disable a specific intr_handle " "successfully\n"); return -1; } /* check with specific valid intr_handle */ - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_VALID_ALARM]; - if (rte_intr_disable(&test_intr_handle) == 0) { + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID_ALARM); + if (rte_intr_disable(test_intr_handle) == 0) { printf("unexpectedly disable a specific intr_handle " "successfully\n"); return -1; } /* check with specific valid intr_handle */ - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_VALID_DEV_EVENT]; - if (rte_intr_disable(&test_intr_handle) == 0) { + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID_DEV_EVENT); + if (rte_intr_disable(test_intr_handle) == 0) { printf("unexpectedly disable a specific intr_handle " "successfully\n"); return -1; } /* check with valid handler and its type */ - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_CASE1]; - if (rte_intr_disable(&test_intr_handle) < 0) { + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_CASE1); + if (rte_intr_disable(test_intr_handle) < 0) { printf("fail to disable interrupt on a simulated handler\n"); return -1; } - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_VALID_UIO]; - if (rte_intr_disable(&test_intr_handle) == 0) { + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID_UIO); + if (rte_intr_disable(test_intr_handle) == 0) { printf("unexpectedly disable a specific intr_handle " "successfully\n"); return -1; @@ -351,13 +408,14 @@ static int test_interrupt_full_path_check(enum test_interrupt_handle_type intr_type) { int count; - struct rte_intr_handle test_intr_handle; + struct rte_intr_handle *test_intr_handle; flag = 0; - test_intr_handle = intr_handles[intr_type]; + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + intr_type); test_intr_type = intr_type; - if (rte_intr_callback_register(&test_intr_handle, - test_interrupt_callback, &test_intr_handle) < 0) { + if (rte_intr_callback_register(test_intr_handle, + test_interrupt_callback, test_intr_handle) < 0) { printf("fail to register callback\n"); return -1; } @@ -371,9 +429,9 @@ test_interrupt_full_path_check(enum test_interrupt_handle_type intr_type) rte_delay_ms(TEST_INTERRUPT_CHECK_INTERVAL); while ((count = - rte_intr_callback_unregister(&test_intr_handle, + rte_intr_callback_unregister(test_intr_handle, test_interrupt_callback, - &test_intr_handle)) < 0) { + test_intr_handle)) < 0) { if (count != -EAGAIN) return -1; } @@ -396,7 +454,7 @@ static int test_interrupt(void) { int ret = -1; - struct rte_intr_handle test_intr_handle; + struct rte_intr_handle *test_intr_handle; if (test_interrupt_init() < 0) { printf("fail to initialize for testing interrupt\n"); @@ -444,17 +502,20 @@ test_interrupt(void) } /* check if it will fail to register cb with invalid intr_handle */ - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_INVALID]; - if (rte_intr_callback_register(&test_intr_handle, - test_interrupt_callback, &test_intr_handle) == 0) { + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_INVALID); + if (rte_intr_callback_register(test_intr_handle, + test_interrupt_callback, test_intr_handle) == 0) { printf("unexpectedly register successfully with invalid " "intr_handle\n"); goto out; } /* check if it will fail to register without callback */ - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_VALID]; - if (rte_intr_callback_register(&test_intr_handle, NULL, &test_intr_handle) == 0) { + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID); + if (rte_intr_callback_register(test_intr_handle, NULL, + test_intr_handle) == 0) { printf("unexpectedly register successfully with " "null callback\n"); goto out; @@ -469,39 +530,41 @@ test_interrupt(void) } /* check if it will fail to unregister cb with invalid intr_handle */ - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_INVALID]; - if (rte_intr_callback_unregister(&test_intr_handle, - test_interrupt_callback, &test_intr_handle) > 0) { + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_INVALID); + if (rte_intr_callback_unregister(test_intr_handle, + test_interrupt_callback, test_intr_handle) > 0) { printf("unexpectedly unregister successfully with " "invalid intr_handle\n"); goto out; } /* check if it is ok to register the same intr_handle twice */ - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_VALID]; - if (rte_intr_callback_register(&test_intr_handle, - test_interrupt_callback, &test_intr_handle) < 0) { + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID); + if (rte_intr_callback_register(test_intr_handle, + test_interrupt_callback, test_intr_handle) < 0) { printf("it fails to register test_interrupt_callback\n"); goto out; } - if (rte_intr_callback_register(&test_intr_handle, - test_interrupt_callback_1, &test_intr_handle) < 0) { + if (rte_intr_callback_register(test_intr_handle, + test_interrupt_callback_1, test_intr_handle) < 0) { printf("it fails to register test_interrupt_callback_1\n"); goto out; } /* check if it will fail to unregister with invalid parameter */ - if (rte_intr_callback_unregister(&test_intr_handle, + if (rte_intr_callback_unregister(test_intr_handle, test_interrupt_callback, (void *)0xff) != 0) { printf("unexpectedly unregisters successfully with " "invalid arg\n"); goto out; } - if (rte_intr_callback_unregister(&test_intr_handle, - test_interrupt_callback, &test_intr_handle) <= 0) { + if (rte_intr_callback_unregister(test_intr_handle, + test_interrupt_callback, test_intr_handle) <= 0) { printf("it fails to unregister test_interrupt_callback\n"); goto out; } - if (rte_intr_callback_unregister(&test_intr_handle, + if (rte_intr_callback_unregister(test_intr_handle, test_interrupt_callback_1, (void *)-1) <= 0) { printf("it fails to unregister test_interrupt_callback_1 " "for all\n"); @@ -528,28 +591,32 @@ test_interrupt(void) out: printf("Clearing for interrupt tests\n"); /* clear registered callbacks */ - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_VALID]; - rte_intr_callback_unregister(&test_intr_handle, + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID); + rte_intr_callback_unregister(test_intr_handle, test_interrupt_callback, (void *)-1); - rte_intr_callback_unregister(&test_intr_handle, + rte_intr_callback_unregister(test_intr_handle, test_interrupt_callback_1, (void *)-1); - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_VALID_UIO]; - rte_intr_callback_unregister(&test_intr_handle, + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID_UIO); + rte_intr_callback_unregister(test_intr_handle, test_interrupt_callback, (void *)-1); - rte_intr_callback_unregister(&test_intr_handle, + rte_intr_callback_unregister(test_intr_handle, test_interrupt_callback_1, (void *)-1); - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_VALID_ALARM]; - rte_intr_callback_unregister(&test_intr_handle, + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID_ALARM); + rte_intr_callback_unregister(test_intr_handle, test_interrupt_callback, (void *)-1); - rte_intr_callback_unregister(&test_intr_handle, + rte_intr_callback_unregister(test_intr_handle, test_interrupt_callback_1, (void *)-1); - test_intr_handle = intr_handles[TEST_INTERRUPT_HANDLE_VALID_DEV_EVENT]; - rte_intr_callback_unregister(&test_intr_handle, + test_intr_handle = rte_intr_handle_instance_index_get(intr_handles, + TEST_INTERRUPT_HANDLE_VALID_DEV_EVENT); + rte_intr_callback_unregister(test_intr_handle, test_interrupt_callback, (void *)-1); - rte_intr_callback_unregister(&test_intr_handle, + rte_intr_callback_unregister(test_intr_handle, test_interrupt_callback_1, (void *)-1); rte_delay_ms(2 * TEST_INTERRUPT_CHECK_INTERVAL);