From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 97B65A05D3 for ; Thu, 25 Apr 2019 17:41:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8DD201B5DA; Thu, 25 Apr 2019 17:41:02 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 319961B5CE for ; Thu, 25 Apr 2019 17:41:00 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 89DE288302; Thu, 25 Apr 2019 15:40:59 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.116.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id A73965D9CC; Thu, 25 Apr 2019 15:40:58 +0000 (UTC) From: Kevin Traynor To: Natanael Copa Cc: dpdk stable Date: Thu, 25 Apr 2019 16:39:46 +0100 Message-Id: <20190425154037.28778-11-ktraynor@redhat.com> In-Reply-To: <20190425154037.28778-1-ktraynor@redhat.com> References: <20190425154037.28778-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 25 Apr 2019 15:40:59 +0000 (UTC) Subject: [dpdk-stable] patch 'eal/linux: remove thread ID from debug message' has been queued to LTS release 18.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/01/19. 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 rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches can be viewed on the 18.11 branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From 339f737749f8962a06d65b77dcd07128165635aa Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 13 Mar 2019 18:06:57 +0100 Subject: [PATCH] eal/linux: remove thread ID from debug message [ upstream commit c2d82896ac6d9ea02c76044a8d4a612023ccf571 ] There is no guarantee that pthread_self() returns the thread ID or that pthread_t is an integer. The thread ID is not that useful so simply remove it. This fixes the following warning when building with musl libc: lib/librte_eal/linuxapp/eal/eal_dev.c: In function 'sigbus_handler': lib/librte_eal/linuxapp/eal/eal_dev.c:70:3: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] (int)pthread_self(), info->si_addr); ^ Fixes: 0fc54536b14a ("eal: add failure handling for hot-unplug") Signed-off-by: Natanael Copa --- lib/librte_eal/linuxapp/eal/eal_dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_dev.c b/lib/librte_eal/linuxapp/eal/eal_dev.c index 2830c8687..c41809380 100644 --- a/lib/librte_eal/linuxapp/eal/eal_dev.c +++ b/lib/librte_eal/linuxapp/eal/eal_dev.c @@ -67,6 +67,6 @@ static void sigbus_handler(int signum, siginfo_t *info, int ret; - RTE_LOG(DEBUG, EAL, "Thread[%d] catch SIGBUS, fault address:%p\n", - (int)pthread_self(), info->si_addr); + RTE_LOG(DEBUG, EAL, "Thread catch SIGBUS, fault address:%p\n", + info->si_addr); rte_spinlock_lock(&failure_handle_lock); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-25 16:37:47.252158662 +0100 +++ 0011-eal-linux-remove-thread-ID-from-debug-message.patch 2019-04-25 16:37:46.695296093 +0100 @@ -1 +1 @@ -From c2d82896ac6d9ea02c76044a8d4a612023ccf571 Mon Sep 17 00:00:00 2001 +From 339f737749f8962a06d65b77dcd07128165635aa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c2d82896ac6d9ea02c76044a8d4a612023ccf571 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ - lib/librte_eal/linux/eal/eal_dev.c | 4 ++-- + lib/librte_eal/linuxapp/eal/eal_dev.c | 4 ++-- @@ -26 +27 @@ -diff --git a/lib/librte_eal/linux/eal/eal_dev.c b/lib/librte_eal/linux/eal/eal_dev.c +diff --git a/lib/librte_eal/linuxapp/eal/eal_dev.c b/lib/librte_eal/linuxapp/eal/eal_dev.c @@ -28,2 +29,2 @@ ---- a/lib/librte_eal/linux/eal/eal_dev.c -+++ b/lib/librte_eal/linux/eal/eal_dev.c +--- a/lib/librte_eal/linuxapp/eal/eal_dev.c ++++ b/lib/librte_eal/linuxapp/eal/eal_dev.c