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 7C74EA0613 for ; Tue, 27 Aug 2019 11:30:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 750061BFAD; Tue, 27 Aug 2019 11:30:47 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 32AE41BFE1 for ; Tue, 27 Aug 2019 11:30:45 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AC430308FC22 for ; Tue, 27 Aug 2019 09:30:44 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id A51A85C1B2; Tue, 27 Aug 2019 09:30:43 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: dpdk stable Date: Tue, 27 Aug 2019 10:29:40 +0100 Message-Id: <20190827093032.20423-3-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 27 Aug 2019 09:30:44 +0000 (UTC) Subject: [dpdk-stable] patch 'kni: abort when IOVA is not PA' has been queued to LTS release 18.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/03/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 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/5c94659a276a981fdb820bf15bb00860c8eed7a1 Thanks. Kevin Traynor --- >From 5c94659a276a981fdb820bf15bb00860c8eed7a1 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 14 Jun 2019 11:39:15 +0200 Subject: [PATCH] kni: abort when IOVA is not PA [ upstream commit fe8fc6b0b7eaf9078d804d57221000a494753997 ] If a forced iova-mode has been passed at init, kni is not supposed to work. Fixes: 075b182b54ce ("eal: force IOVA to a particular mode") Signed-off-by: David Marchand --- lib/librte_kni/rte_kni.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c index 73aeccccf..99b6c3e13 100644 --- a/lib/librte_kni/rte_kni.c +++ b/lib/librte_kni/rte_kni.c @@ -98,4 +98,9 @@ int rte_kni_init(unsigned int max_kni_ifaces __rte_unused) { + if (rte_eal_iova_mode() != RTE_IOVA_PA) { + RTE_LOG(ERR, KNI, "KNI requires IOVA as PA\n"); + return -1; + } + /* Check FD and open */ if (kni_fd < 0) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:11.099306886 +0100 +++ 0003-kni-abort-when-IOVA-is-not-PA.patch 2019-08-27 09:40:10.845146209 +0100 @@ -1 +1 @@ -From fe8fc6b0b7eaf9078d804d57221000a494753997 Mon Sep 17 00:00:00 2001 +From 5c94659a276a981fdb820bf15bb00860c8eed7a1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fe8fc6b0b7eaf9078d804d57221000a494753997 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 00104a35d..e60de2cdb 100644 +index 73aeccccf..99b6c3e13 100644