DPDK patches and discussions
 help / color / mirror / Atom feed
From: wangyunjian <wangyunjian@huawei.com>
To: <dev@dpdk.org>
Cc: <jia.guo@intel.com>, <jerry.lilijun@huawei.com>,
	<xudingke@huawei.com>, Yunjian Wang <wangyunjian@huawei.com>,
	<stable@dpdk.org>
Subject: [dpdk-dev]  [PATCH 2/3] eal: fix remove incorrect event_cb
Date: Wed, 3 Jun 2020 20:55:04 +0800
Message-ID: <a2a8a6832e6621e578c6f779221d00cbd620b3b6.1591186247.git.wangyunjian@huawei.com> (raw)
In-Reply-To: <cover.1591186247.git.wangyunjian@huawei.com>

From: Yunjian Wang <wangyunjian@huawei.com>

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 <wangyunjian@huawei.com>
---
 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



  parent reply	other threads:[~2020-06-03 12:55 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-03 12:33 [dpdk-dev] [PATCH 0/3] fixes for device event wangyunjian
2020-06-03 12:54 ` wangyunjian
2020-06-03 12:54 ` [dpdk-dev] [PATCH 1/3] eal: fix memory leak when removing event_cb wangyunjian
2020-06-03 12:55 ` wangyunjian [this message]
2020-06-12  5:56   ` [dpdk-dev] [PATCH 2/3] eal: fix remove incorrect event_cb Jeff Guo
2020-06-30 11:29     ` wangyunjian
2020-06-30 11:56   ` [dpdk-dev] [PATCH v2] eal: fix memory leak when removing event_cb wangyunjian
2020-07-02  9:28     ` Jeff Guo
2020-07-02 10:53       ` wangyunjian
2020-07-02 11:46   ` [dpdk-dev] [PATCH v3 0/2] fixes for device event wangyunjian
2020-07-02 11:47   ` [dpdk-dev] [PATCH v3 1/2] eal: fix memory leak when removing event_cb wangyunjian
2020-07-03  6:04     ` Jeff Guo
2020-07-03  7:00       ` wangyunjian
2020-07-03  7:23     ` [dpdk-dev] [dpdk-stable] " David Marchand
2020-07-03  7:52       ` wangyunjian
2020-07-03  8:01         ` David Marchand
2020-07-02 11:47   ` [dpdk-dev] [PATCH v3 2/2] eal: return error code when failure wangyunjian
2020-06-03 12:55 ` [dpdk-dev] [PATCH 3/3] " wangyunjian
2020-07-02  9:18   ` Jeff Guo
2020-07-02 10:43     ` wangyunjian

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a2a8a6832e6621e578c6f779221d00cbd620b3b6.1591186247.git.wangyunjian@huawei.com \
    --to=wangyunjian@huawei.com \
    --cc=dev@dpdk.org \
    --cc=jerry.lilijun@huawei.com \
    --cc=jia.guo@intel.com \
    --cc=stable@dpdk.org \
    --cc=xudingke@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git