Re: [dpdk-stable] [PATCH] kni: resolve build issue for OpenSuse15.3

[Ferruh Yigit <ferruh.yigit@intel.com>]

On 10/13/2021 3:33 PM, Aman Singh wrote:
> 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 <aman.deep.singh@intel.com>
> ---
>   kernel/linux/kni/compat.h    |  3 ++-
>   kernel/linux/kni/meson.build | 14 +++++++++++++-
>   2 files changed, 15 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
> index 5f65640d5e..664785674f 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 c15c78b0b4..32533fe932 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 <bluca@debian.org>
>   
> +# 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_build_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@'])
> @@ -17,7 +28,8 @@ custom_target('rte_kni',
>           command: ['make', '-j4', '-C', kernel_build_dir,
>               '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/eal/include' +
>               ' -I' + meson.source_root() + '/lib/kni' +
>               ' -I' + meson.build_root() +
> 

Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>

I didn't check on the SUSE, but _unconventional_ detection method
is not causing any problem in my test environment.