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 68138A0542 for ; Fri, 7 Feb 2020 16:14:24 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5B5501C038; Fri, 7 Feb 2020 16:14:24 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 1598F1C02E for ; Fri, 7 Feb 2020 16:14:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581088462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J6h29Uy3Ff88KfvDfcuLfJkxyWOCGud68dzF5DW+lIw=; b=R2sGZt5M97FAKENrPxkq41BncGGlTNjWwzaBZEcEFPJ63e5KTAkSnsgATCsHNwEmsNyExG ahcVNvgzhPWyFbNzcJ5tEhof+HPNpdAhy0iNCAD8yvf3NatRxBy93Yj9p5ruP+AhQQ2Xas NdQ9C/xYfT/XUDPR/AeyU+IOHiIcs8M= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-128-sTJKmeMsPBehTKNPLuCrHg-1; Fri, 07 Feb 2020 10:14:04 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8504F800D54; Fri, 7 Feb 2020 15:14:02 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E27B1001B28; Fri, 7 Feb 2020 15:14:01 +0000 (UTC) From: Kevin Traynor To: Ricardo Roldan Cc: Ferruh Yigit , dpdk stable Date: Fri, 7 Feb 2020 15:12:44 +0000 Message-Id: <20200207151248.29804-32-ktraynor@redhat.com> In-Reply-To: <20200207151248.29804-1-ktraynor@redhat.com> References: <20200207151248.29804-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: sTJKmeMsPBehTKNPLuCrHg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'ethdev: fix callback unregister with wildcard argument list' has been queued to LTS release 18.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/bc5c69b58a8a96e62e= c46811055796ce1d08ca73 Thanks. Kevin. --- >From bc5c69b58a8a96e62ec46811055796ce1d08ca73 Mon Sep 17 00:00:00 2001 From: Ricardo Roldan Date: Tue, 7 Jan 2020 16:51:36 +0100 Subject: [PATCH] ethdev: fix callback unregister with wildcard argument lis= t [ upstream commit ba1e69f121b97b4c8673a48c98072accdbc5af46 ] The function was checking -1 against the callback data instead of the given cb_arg parameter. Fixes: af75078fece3 ("first public release") Signed-off-by: Ricardo Roldan Reviewed-by: Ferruh Yigit --- lib/librte_ethdev/rte_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.= c index a5df3e562e..51954456c2 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -3461,5 +3461,5 @@ rte_eth_dev_callback_unregister(uint16_t port_id, =20 =09=09=09if (cb->cb_fn !=3D cb_fn || cb->event !=3D event || -=09=09=09 (cb->cb_arg !=3D (void *)-1 && cb->cb_arg !=3D cb_arg)) +=09=09=09 (cb_arg !=3D (void *)-1 && cb->cb_arg !=3D cb_arg)) =09=09=09=09continue; =20 --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-07 15:08:19.192408000 +0000 +++ 0032-ethdev-fix-callback-unregister-with-wildcard-argumen.patch=092020-= 02-07 15:08:17.568062232 +0000 @@ -1 +1 @@ -From ba1e69f121b97b4c8673a48c98072accdbc5af46 Mon Sep 17 00:00:00 2001 +From bc5c69b58a8a96e62ec46811055796ce1d08ca73 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ba1e69f121b97b4c8673a48c98072accdbc5af46 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 6e9cb243ea..aec2d0f704 100644 +index a5df3e562e..51954456c2 100644 @@ -22 +23 @@ -@@ -4040,5 +4040,5 @@ rte_eth_dev_callback_unregister(uint16_t port_id, +@@ -3461,5 +3461,5 @@ rte_eth_dev_callback_unregister(uint16_t port_id,