From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AD7C3A04A2; Wed, 3 Jun 2020 14:55:17 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 848C81D516; Wed, 3 Jun 2020 14:55:17 +0200 (CEST) Received: from huawei.com (szxga04-in.huawei.com [45.249.212.190]) by dpdk.org (Postfix) with ESMTP id 7FA1E1D15A; Wed, 3 Jun 2020 14:55:15 +0200 (CEST) Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 0CDE52452BFD2817CED7; Wed, 3 Jun 2020 20:55:15 +0800 (CST) Received: from localhost (10.173.251.152) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.487.0; Wed, 3 Jun 2020 20:55:05 +0800 From: wangyunjian To: CC: , , , Yunjian Wang , Date: Wed, 3 Jun 2020 20:55:04 +0800 Message-ID: X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.173.251.152] X-CFilter-Loop: Reflected Subject: [dpdk-dev] [PATCH 2/3] eal: fix remove incorrect event_cb X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" From: Yunjian Wang When the device_name is NULL, it will remove the event_cb directly. We need to compare the 'cb_fn' and 'cb_arg' at the same time. Fixes: a753e53d517b ("eal: add device event monitor framework") Cc: stable@dpdk.org Signed-off-by: Yunjian Wang --- lib/librte_eal/common/eal_common_dev.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c index 4cfdb80..6b465bc 100644 --- a/lib/librte_eal/common/eal_common_dev.c +++ b/lib/librte_eal/common/eal_common_dev.c @@ -516,7 +516,12 @@ static int cmp_dev_name(const struct rte_device *dev, const void *_name) event_cb->cb_arg != cb_arg)) continue; } - } else if (device_name != NULL) { + } else if (device_name == NULL && event_cb->dev_name == NULL) { + if (event_cb->cb_fn != cb_fn || + (cb_arg != (void *)-1 && + event_cb->cb_arg != cb_arg)) + continue; + } else { continue; } -- 1.8.3.1