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 22F02A0553 for ; Mon, 17 Feb 2020 18:46:03 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1CD4B1DA9F; Mon, 17 Feb 2020 18:46:03 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 1B36F1DA9F for ; Mon, 17 Feb 2020 18:46:02 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id u6so20850942wrt.0 for ; Mon, 17 Feb 2020 09:46:02 -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=kqTMRK0hxtgoAkJNwEUMjL4SVfXnS6LBYkDkofS1crs=; b=ecj1p7jYQx8muOj0iJFERFLYDXSY4CAK/qUuoGHVDpLdUqMGzKdd9dei/WdmDXWmDN mPsWZLvRbBZQxZPtI27tV/MuwKHsnDYbl7eUGnNVNKWToXEzQMMWn1XH8C/iIBWvA66/ HRUX/QvLPuW+Aj3imxH03rez3GC0J+5okJS9PHV/Gi2fqxNDdsQWjWJ9S7Dq8GlMfY7U GB80XZEZPO8kfHScKYu5HpU3P6aQSGQW1JtZoiNMVRgJpOg3saEkkvRh3NojpBQkraE4 Qd/a24AANY69MSjdHf7294IGyd4UeF7ND9mKknGQrKQ5inhBhnp3mXXI6mBM9GQgKGRv AJPA== 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=kqTMRK0hxtgoAkJNwEUMjL4SVfXnS6LBYkDkofS1crs=; b=EU/DKI6I/Pu6mGzJnOi3JFRTGcH0dcJNp22ndE5dT0q1ckhM6XeBhA+8rqQk2KKXVb 8iisIt8VGAHlxwJ5NYCuRkvw5TaR1YZGsz1wsYRlTkoiskftzaSMovQQW/QVRgwG8MRe hyRrl2zCKf/62cz2hakZybjW53ghDabgoneD0z1SCNrCzc1g9jzCaoR1J4KT0YqWJHd5 OZAvmu+HdRayNYAIRIN7DdMfY7+Kgza1sPops2+UkxDvDE9jpH4IGcIMpvo+xWqZkp// KGHIIRuJJwFDXBdqVs83JQIxoA4XqrYnI+i5sxlPT0Y8Y70LOpk750gvzc6NRtemCTu0 7BMQ== X-Gm-Message-State: APjAAAVVjPoJSRMNczhZTwcKQEkeeSu6wgYqJhq0Zq2b6DvHFN3Yl7g7 +OSPcTYI5Qj3GgZzDfDhis2wE8o08+8= X-Google-Smtp-Source: APXvYqwAoJ701oEVJCQad2OYt2lxf5mBu6danlenisfNNiMWUs+gWkkhsyO8HKwCJ7/n+pQbhBwjZA== X-Received: by 2002:adf:ea8a:: with SMTP id s10mr22250799wrm.278.1581961561811; Mon, 17 Feb 2020 09:46:01 -0800 (PST) Received: from localhost (userh634.uk.uudial.com. [194.69.103.7]) by smtp.gmail.com with ESMTPSA id p12sm2067303wrx.10.2020.02.17.09.46.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 09:46:01 -0800 (PST) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: David Marchand , dpdk stable Date: Mon, 17 Feb 2020 17:44:59 +0000 Message-Id: <20200217174546.25334-7-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200217174546.25334-1-luca.boccassi@gmail.com> References: <20200211112216.3929-190-luca.boccassi@gmail.com> <20200217174546.25334-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'kni: fix build with Linux 5.6' has been queued to stable release 19.11.1 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 stable release 19.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/19/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 rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From c7b6fa38f45d6cd51bdff326e0c473a371af8832 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 7109474ec5..9ee45dbf6f 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -130,3 +130,7 @@ #if KERNEL_VERSION(4, 10, 0) <= LINUX_VERSION_CODE #define HAVE_IOVA_TO_KVA_MAPPING_SUPPORT #endif + +#if KERNEL_VERSION(5, 6, 0) <= 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 97fe85be9a..c82c881a2c 100644 --- a/kernel/linux/kni/kni_net.c +++ b/kernel/linux/kni/kni_net.c @@ -623,8 +623,13 @@ 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 { pr_debug("Transmit timeout at %ld, latency %ld\n", jiffies, jiffies - dev_trans_start(dev)); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-17 17:00:15.552453554 +0000 +++ 0007-kni-fix-build-with-Linux-5.6.patch 2020-02-17 17:00:15.271949945 +0000 @@ -1,16 +1,16 @@ -From 38ad54f3bc7614b53bd6ca3644a471a3842502fc Mon Sep 17 00:00:00 2001 +From c7b6fa38f45d6cd51bdff326e0c473a371af8832 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. -Cc: stable@dpdk.org - Signed-off-by: Ferruh Yigit Acked-by: David Marchand ---