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 C0DF6A00C5 for ; Wed, 8 Dec 2021 11:34:16 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AFA5E406FF; Wed, 8 Dec 2021 11:34:16 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id 31291406FF for ; Wed, 8 Dec 2021 11:34:15 +0100 (CET) X-IronPort-AV: E=McAfee;i="6200,9189,10191"; a="235316986" X-IronPort-AV: E=Sophos;i="5.87,297,1631602800"; d="scan'208";a="235316986" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Dec 2021 02:34:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,297,1631602800"; d="scan'208";a="515706639" Received: from silpixa00399752.ir.intel.com (HELO silpixa00399752.ger.corp.intel.com) ([10.237.222.27]) by orsmga008.jf.intel.com with ESMTP; 08 Dec 2021 02:34:12 -0800 From: Ferruh Yigit To: stable@dpdk.org Cc: Aman Singh , Longfeng Liang , yux.jiang@intel.com Subject: [20.11] kni: fix build for SLES15-SP3 Date: Wed, 8 Dec 2021 10:34:10 +0000 Message-Id: <20211208103410.835542-1-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 From: Aman Singh [ upstream commit c28e2165ec360c39ea0e3a0c02b4229966697384 ] As suse version numbering is inconsistent to determine Linux kernel API to be used. In this patch we check parameter of 'ndo_tx_timeout' API directly from the kernel source. This is done only for suse build. Bugzilla ID: 812 Cc: stable@dpdk.org Signed-off-by: Aman Singh Acked-by: Ferruh Yigit Tested-by: Longfeng Liang --- Cc: yux.jiang@intel.com @Yu, can you please test the patch on SLES15-SP3, I am sending the backport without testing it on SUSE. --- kernel/linux/kni/compat.h | 3 ++- kernel/linux/kni/meson.build | 14 +++++++++++++- kernel/linux/meson.build | 6 ++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index 5f65640d5ed2..664785674ff1 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -133,7 +133,8 @@ #if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE || \ (defined(RHEL_RELEASE_CODE) && \ - RHEL_RELEASE_VERSION(8, 3) <= RHEL_RELEASE_CODE) + RHEL_RELEASE_VERSION(8, 3) <= RHEL_RELEASE_CODE) || \ + (defined(CONFIG_SUSE_KERNEL) && defined(HAVE_ARG_TX_QUEUE)) #define HAVE_TX_TIMEOUT_TXQUEUE #endif diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build index 07e0c9dae727..0eedbd6cb10e 100644 --- a/kernel/linux/kni/meson.build +++ b/kernel/linux/kni/meson.build @@ -1,6 +1,17 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Luca Boccassi +# For SUSE build check function arguments of ndo_tx_timeout API +# Ref: https://jira.devtools.intel.com/browse/DPDK-29263 +kmod_cflags = '' +file_path = kernel_source_dir + '/include/linux/netdevice.h' +run_cmd = run_command('grep', 'ndo_tx_timeout', file_path) + +if run_cmd.stdout().contains('txqueue') == true + kmod_cflags = '-DHAVE_ARG_TX_QUEUE' +endif + + kni_mkfile = custom_target('rte_kni_makefile', output: 'Makefile', command: ['touch', '@OUTPUT@']) @@ -16,7 +27,8 @@ custom_target('rte_kni', command: ['make', '-j4', '-C', kernel_dir + '/build', 'M=' + meson.current_build_dir(), 'src=' + meson.current_source_dir(), - 'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' + + ' '.join(['MODULE_CFLAGS=', kmod_cflags,'-include ']) + + meson.source_root() + '/config/rte_config.h' + ' -I' + meson.source_root() + '/lib/librte_eal/include' + ' -I' + meson.source_root() + '/lib/librte_kni' + ' -I' + meson.build_root() + diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build index 5c864a465344..76eb279d9e59 100644 --- a/kernel/linux/meson.build +++ b/kernel/linux/meson.build @@ -15,6 +15,12 @@ if kernel_dir == '' kernel_dir = '/lib/modules/' + kernel_version endif +kernel_source_dir = get_option('kernel_dir') +if kernel_source_dir == '' + # use default path for native builds + kernel_source_dir = '/lib/modules/' + kernel_version + '/source' +endif + # test running make in kernel directory, using "make kernelversion" make_returncode = run_command('make', '-sC', kernel_dir + '/build', 'kernelversion').returncode() -- 2.33.1