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 3A785A0555 for ; Wed, 19 Feb 2020 16:56:46 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2F726B62; Wed, 19 Feb 2020 16:56:46 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 3B476B62 for ; Wed, 19 Feb 2020 16:56:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582127804; 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=+6nJz+n/ORSYvFEgRlOvdzT7xiHnGVoXunV+ApaV+Fg=; b=I8jejdCcusuYerUagi1PsP7ob4HOpjk9DwQbxvuK7ZaVdYQSv3EbaldyDWZW4myFvZcLsx TZMWAEPso93mRB/RCXAl1M1FowF7ffYZchXPZtNlW+GESH5zjCTVNn3WQKwLrkktxQIc1K r2RA4SZUUdug0Wv4b50Y3cG9FOrYWW8= 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-303-CmDgHvVdN4GjTcXlDMVtxA-1; Wed, 19 Feb 2020 10:56:40 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 39DF2801A05; Wed, 19 Feb 2020 15:56:39 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id ABF3B857BF; Wed, 19 Feb 2020 15:56:32 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: David Marchand , dpdk stable Date: Wed, 19 Feb 2020 15:55:48 +0000 Message-Id: <20200219155607.20495-3-ktraynor@redhat.com> In-Reply-To: <20200219155607.20495-1-ktraynor@redhat.com> References: <20200219155607.20495-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: CmDgHvVdN4GjTcXlDMVtxA-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 'kni: fix build with Linux 5.6' 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/25/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/6ff755242707bbf6ff= 99edc58be5c1d8d791f8b8 Thanks. Kevin. --- >From 6ff755242707bbf6ff99edc58be5c1d8d791f8b8 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Wed, 12 Feb 2020 17:14:24 +0000 Subject: [PATCH] kni: fix build with Linux 5.6 [ upstream commit 38ad54f3bc7614b53bd6ca3644a471a3842502fc ] With the following Linux commit a new parameter 'txqueue' has been added to 'ndo_tx_timeout' ndo: commit 0290bd291cc0 ("netdev: pass the stuck queue to the timeout handler") The change reflected to the KNI with version check. Signed-off-by: Ferruh Yigit Acked-by: David Marchand --- kernel/linux/kni/compat.h | 4 ++++ kernel/linux/kni/kni_net.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index 3c575c70a2..3c3855dcfa 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -118,2 +118,6 @@ #define HAVE_SIGNAL_FUNCTIONS_OWN_HEADER #endif + +#if KERNEL_VERSION(5, 6, 0) <=3D LINUX_VERSION_CODE +#define HAVE_TX_TIMEOUT_TXQUEUE +#endif diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c index f3f2f73c7b..dba6a9c838 100644 --- a/kernel/linux/kni/kni_net.c +++ b/kernel/linux/kni/kni_net.c @@ -597,6 +597,11 @@ kni_net_rx(struct kni_dev *kni) * Deal with a transmit timeout. */ +#ifdef HAVE_TX_TIMEOUT_TXQUEUE +static void +kni_net_tx_timeout(struct net_device *dev, unsigned int txqueue) +#else static void kni_net_tx_timeout(struct net_device *dev) +#endif { =09struct kni_dev *kni =3D netdev_priv(dev); --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-19 15:43:49.904839818 +0000 +++ 0003-kni-fix-build-with-Linux-5.6.patch=092020-02-19 15:43:49.715142317= +0000 @@ -1 +1 @@ -From 38ad54f3bc7614b53bd6ca3644a471a3842502fc Mon Sep 17 00:00:00 2001 +From 6ff755242707bbf6ff99edc58be5c1d8d791f8b8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 38ad54f3bc7614b53bd6ca3644a471a3842502fc ] + @@ -12,2 +13,0 @@ -Cc: stable@dpdk.org - @@ -22 +22 @@ -index 7109474ec5..9ee45dbf6f 100644 +index 3c575c70a2..3c3855dcfa 100644 @@ -25,2 +25,2 @@ -@@ -131,2 +131,6 @@ - #define HAVE_IOVA_TO_KVA_MAPPING_SUPPORT +@@ -118,2 +118,6 @@ + #define HAVE_SIGNAL_FUNCTIONS_OWN_HEADER @@ -33 +33 @@ -index 97fe85be9a..c82c881a2c 100644 +index f3f2f73c7b..dba6a9c838 100644 @@ -36 +36 @@ -@@ -624,6 +624,11 @@ kni_net_rx(struct kni_dev *kni) +@@ -597,6 +597,11 @@ kni_net_rx(struct kni_dev *kni) @@ -47 +47 @@ - =09pr_debug("Transmit timeout at %ld, latency %ld\n", jiffies, + =09struct kni_dev *kni =3D netdev_priv(dev);