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 1CEE9A0A02 for ; Mon, 17 May 2021 18:16:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 16B8F40041; Mon, 17 May 2021 18:16:39 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 3849541101 for ; Mon, 17 May 2021 18:16:37 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifv0-0008MW-Ua; Mon, 17 May 2021 16:16:35 +0000 From: Christian Ehrhardt To: Chengwen Feng Cc: Min Hu , Ferruh Yigit , dpdk stable Date: Mon, 17 May 2021 18:09:42 +0200 Message-Id: <20210517161039.3132619-153-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/kni: check init result' has been queued to stable release 19.11.9 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 19.11.9 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/19/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/6e41fc01e92676cc2e96c21c2bbe160b7cb8f9ae Thanks. Christian Ehrhardt --- >From 6e41fc01e92676cc2e96c21c2bbe160b7cb8f9ae Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Wed, 21 Apr 2021 10:14:18 +0800 Subject: [PATCH] net/kni: check init result [ upstream commit 7fa949fd1122b2e529c538489e2287736f1540e3 ] This patch adds checking for rte_kni_init() result. Fixes: 75e2bc54c018 ("net/kni: add KNI PMD") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) Acked-by: Ferruh Yigit --- drivers/net/kni/rte_eth_kni.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c index c3345f5cb7..16385d4afe 100644 --- a/drivers/net/kni/rte_eth_kni.c +++ b/drivers/net/kni/rte_eth_kni.c @@ -399,8 +399,13 @@ eth_kni_create(struct rte_vdev_device *vdev, static int kni_init(void) { - if (is_kni_initialized == 0) - rte_kni_init(MAX_KNI_PORTS); + int ret; + + if (is_kni_initialized == 0) { + ret = rte_kni_init(MAX_KNI_PORTS); + if (ret < 0) + return ret; + } is_kni_initialized++; -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:35.399375314 +0200 +++ 0153-net-kni-check-init-result.patch 2021-05-17 17:40:29.431811524 +0200 @@ -1 +1 @@ -From 7fa949fd1122b2e529c538489e2287736f1540e3 Mon Sep 17 00:00:00 2001 +From 6e41fc01e92676cc2e96c21c2bbe160b7cb8f9ae Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7fa949fd1122b2e529c538489e2287736f1540e3 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 9ce74e549b..4d2a42ddab 100644 +index c3345f5cb7..16385d4afe 100644 @@ -22 +23 @@ -@@ -406,8 +406,13 @@ eth_kni_create(struct rte_vdev_device *vdev, +@@ -399,8 +399,13 @@ eth_kni_create(struct rte_vdev_device *vdev,