From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 50665A0524 for ; Fri, 5 Feb 2021 12:31:23 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4883C40682; Fri, 5 Feb 2021 12:31:23 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id E441E18899F for ; Fri, 5 Feb 2021 12:31:21 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id l12so5753356wmq.2 for ; Fri, 05 Feb 2021 03:31:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=800ZBhaI7vrKJXt5l6VASn9afRLqCXPnArLrz3IoqqI=; b=eU5RHwpnVD5e2YsqmPkB0kkTHGVoMTGoipCd4gIKGEt/fWNJbWUsTHCVfnXaURIu8L v0EGOSwtFCmdwgxFHEnNUn2k1xUuaKm234NweKyGmJdVsUkuWMNlFHnee0nlIiJhOwmd JhjsOUSVA46bnS5SI/0prVR4nRXYOjfpKjyODlzbcHRpuYKKTyUP2OJOduJW12hf0oBG 2qQaz64G6K0RpjhqNY9y6qIYEOzdpA+/as6P5aJp8pEaSocd+UBFCi2FPHCEd9XRy2Q0 qlEk8ol7CYMcllYn1uHgFfu7HFWhRZv94u3z4DA5i9LqE4hrcn5Sf971rXdhQiInunZ1 xITg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=800ZBhaI7vrKJXt5l6VASn9afRLqCXPnArLrz3IoqqI=; b=cgmR/iuY4rpzGXNlM2otCp6k6tv2Lp/9Cpf9KiYxLXBRqEBlshlKlxqKH6J1WMu0wX c3w1E8OLikJHjdIe7g0IwLOs9MfE6GS3iC/ejRJ5gGy41QLSVRp3Qn8ZYKo2kooWihka UVPO5ME7qrmDuIgWve7OQGOM4jTOlUoTtgNMM7DdjtVEt4soki7mkva5V32ruM0/RmA6 YSpFHW+DBYwXAXMC83zjUHU4x6fBRnfdoy42XgFaPTKpLiAtfdyramLk28aWl0GMHu3H logOZVPNy9MF151k/9q6OBqA1lOn2kmPe4Zr6RbBqR/Z93i82Dn/lKse6IDRNPWeXFEo M8zg== X-Gm-Message-State: AOAM531XfWJmY8dB2Y7I6f5fSDl0MrN+jLoQiPGdzgWYGBirZ95bgvzj jfrYHeuy5sO94TKy77+B2z5rbPSt/fIKG0Tz X-Google-Smtp-Source: ABdhPJxP2qDe98TTLtk60n7PLV3ElyxVjgEyGXSN9PCQBIUh45tLUGY9CXgHKj2vRVlVkXpAm7Yr3w== X-Received: by 2002:a1c:7301:: with SMTP id d1mr3179251wmb.33.1612524681748; Fri, 05 Feb 2021 03:31:21 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i20sm8205448wmq.7.2021.02.05.03.31.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:31:21 -0800 (PST) From: luca.boccassi@gmail.com To: Olivier Matz Cc: Harry van Haaren , dpdk stable Date: Fri, 5 Feb 2021 11:16:44 +0000 Message-Id: <20210205111920.1272063-118-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'service: propagate init error in EAL' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 stable release 20.11.1 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/07/21. 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 are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/43447841b4c02597a6d47d2b4de11d932f141a2f Thanks. Luca Boccassi --- >From 43447841b4c02597a6d47d2b4de11d932f141a2f Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Wed, 13 Jan 2021 09:28:06 +0100 Subject: [PATCH] service: propagate init error in EAL [ upstream commit de6aede17bd3abe51478f33131a4c41da83c42da ] Currently, when rte_service_init() fails at initialization, the application always gets a ENOEXEC error code. For example, with testpmd, this is displayed as: Cannot init EAL: Exec format error This error code does not describe the real issue. Instead, use the error code returned by the function. Fixes: e39824500825 ("service: initialize with EAL") Signed-off-by: Olivier Matz Acked-by: Harry van Haaren --- lib/librte_eal/freebsd/eal.c | 4 ++-- lib/librte_eal/linux/eal.c | 4 ++-- lib/librte_eal/windows/eal.c | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/librte_eal/freebsd/eal.c b/lib/librte_eal/freebsd/eal.c index d6ea023750..51478358c7 100644 --- a/lib/librte_eal/freebsd/eal.c +++ b/lib/librte_eal/freebsd/eal.c @@ -906,7 +906,7 @@ rte_eal_init(int argc, char **argv) ret = rte_service_init(); if (ret) { rte_eal_init_alert("rte_service_init() failed"); - rte_errno = ENOEXEC; + rte_errno = -ret; return -1; } @@ -922,7 +922,7 @@ rte_eal_init(int argc, char **argv) */ ret = rte_service_start_with_defaults(); if (ret < 0 && ret != -ENOTSUP) { - rte_errno = ENOEXEC; + rte_errno = -ret; return -1; } diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c index a4161be630..32b48c3de9 100644 --- a/lib/librte_eal/linux/eal.c +++ b/lib/librte_eal/linux/eal.c @@ -1273,7 +1273,7 @@ rte_eal_init(int argc, char **argv) ret = rte_service_init(); if (ret) { rte_eal_init_alert("rte_service_init() failed"); - rte_errno = ENOEXEC; + rte_errno = -ret; return -1; } @@ -1295,7 +1295,7 @@ rte_eal_init(int argc, char **argv) */ ret = rte_service_start_with_defaults(); if (ret < 0 && ret != -ENOTSUP) { - rte_errno = ENOEXEC; + rte_errno = -ret; return -1; } diff --git a/lib/librte_eal/windows/eal.c b/lib/librte_eal/windows/eal.c index 105549de1b..1e5f6576f0 100644 --- a/lib/librte_eal/windows/eal.c +++ b/lib/librte_eal/windows/eal.c @@ -264,6 +264,7 @@ rte_eal_init(int argc, char **argv) const struct rte_config *config = rte_eal_get_configuration(); struct internal_config *internal_conf = eal_get_internal_configuration(); + int ret; rte_eal_log_init(NULL, 0); @@ -387,9 +388,10 @@ rte_eal_init(int argc, char **argv) } /* Initialize services so drivers can register services during probe. */ - if (rte_service_init()) { + ret = rte_service_init(); + if (ret) { rte_eal_init_alert("rte_service_init() failed"); - rte_errno = ENOEXEC; + rte_errno = -ret; return -1; } -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:34.508377088 +0000 +++ 0118-service-propagate-init-error-in-EAL.patch 2021-02-05 11:18:28.994694692 +0000 @@ -1 +1 @@ -From de6aede17bd3abe51478f33131a4c41da83c42da Mon Sep 17 00:00:00 2001 +From 43447841b4c02597a6d47d2b4de11d932f141a2f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit de6aede17bd3abe51478f33131a4c41da83c42da ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org