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 2EDF1A04DD for ; Thu, 26 Nov 2020 19:09:12 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5630FCA52; Thu, 26 Nov 2020 19:09:10 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 69DDECA46; Thu, 26 Nov 2020 19:09:06 +0100 (CET) IronPort-SDR: mNw7PjJNllxpiw3BJ45WAPh8BOUB8rM0EnFCCbzSlvBPuax/Ir+NAx2SOTAeH4EkiDILjVz44K +5X3+/41T7lA== X-IronPort-AV: E=McAfee;i="6000,8403,9817"; a="151569469" X-IronPort-AV: E=Sophos;i="5.78,372,1599548400"; d="scan'208";a="151569469" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 10:09:04 -0800 IronPort-SDR: SJJYJh6PIVE9UnccIGwVNLeh++jGhhNrRMFgnveGb/2Jn+XyEW/SLu1L4MyBjtRpB+cnw2rWK2 inASomOVguPA== X-IronPort-AV: E=Sophos;i="5.78,372,1599548400"; d="scan'208";a="333441505" Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.213.229.67]) ([10.213.229.67]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 10:09:02 -0800 To: David Marchand , Olivier Matz Cc: dev , Kevin Traynor , dpdk stable , Christophe Grosse References: <20201126142344.25018-1-olivier.matz@6wind.com> From: Ferruh Yigit Message-ID: <0f887a24-4bc9-b2f8-c4c1-708a8745ab91@intel.com> Date: Thu, 26 Nov 2020 18:08:58 +0000 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-stable] [PATCH] kni: fix compilation on RHEL 8.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" On 11/26/2020 6:04 PM, David Marchand wrote: > On Thu, Nov 26, 2020 at 3:24 PM Olivier Matz wrote: >> >> Like what was done for mainline kernel in commit 38ad54f3bc76 ("kni: fix >> build with Linux 5.6"), a new parameter 'txqueue' has to be added to >> 'ndo_tx_timeout' ndo on RHEL 8.3 kernel. >> >> Cc: stable@dpdk.org >> >> Tested-by: Christophe Grosse >> Signed-off-by: Olivier Matz > > Reproduced issue on a RHEL 8.3 with kernel 4.18.0-240.el8.x86_64. > FAILED: kernel/linux/kni/rte_kni.ko > make -j4 -C /lib/modules/4.18.0-240.el8.x86_64/build > M=/root/dpdk/build/kernel/linux/kni src=/root/dpdk/kernel/linux/kni > 'MODULE_CFLAGS=-include /root/dpdk/config/rte_config.h > -I/root/dpdk/lib/librte_eal/include -I/root/dpdk/lib/librte_kni > -I/root/dpdk/build -I/root/dpdk/kernel/linux/kni' modules > make: Entering directory '/usr/src/kernels/4.18.0-240.el8.x86_64' > CC [M] /root/dpdk/build/kernel/linux/kni/kni_net.o > CC [M] /root/dpdk/build/kernel/linux/kni/kni_misc.o > /root/dpdk/kernel/linux/kni/kni_net.c:791:20: error: initialization of > ‘void (*)(struct net_device *, unsigned int)’ from incompatible > pointer type ‘void (*)(struct net_device *)’ > [-Werror=incompatible-pointer-types] > .ndo_tx_timeout = kni_net_tx_timeout, > ^~~~~~~~~~~~~~~~~~ > /root/dpdk/kernel/linux/kni/kni_net.c:791:20: note: (near > initialization for ‘kni_net_netdev_ops..ndo_tx_timeout’) > cc1: some warnings being treated as errors > make[1]: *** [scripts/Makefile.build:315: > /root/dpdk/build/kernel/linux/kni/kni_net.o] Error 1 > make: *** [Makefile:1544: _module_/root/dpdk/build/kernel/linux/kni] Error 2 > make: Leaving directory '/usr/src/kernels/4.18.0-240.el8.x86_64' > ninja: build stopped: subcommand failed. > > > >> --- >> kernel/linux/kni/compat.h | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h >> index d515b27669..5f65640d5e 100644 >> --- a/kernel/linux/kni/compat.h >> +++ b/kernel/linux/kni/compat.h >> @@ -131,7 +131,9 @@ >> #define HAVE_IOVA_TO_KVA_MAPPING_SUPPORT >> #endif >> >> -#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE >> +#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE || \ >> + (defined(RHEL_RELEASE_CODE) && \ >> + RHEL_RELEASE_VERSION(8, 3) <= RHEL_RELEASE_CODE) >> #define HAVE_TX_TIMEOUT_TXQUEUE >> #endif >> >> -- >> 2.25.1 >> > > Tested-by: David Marchand > Thanks. > Thanks David for testing. Acked-by: Ferruh Yigit